Skip to content

Commit 93905d3

Browse files
committed
Merge branch 'bc/c23'
C23 compatibility updates. * bc/c23: reflog: rename unreachable index-pack: rename struct thread_local
2 parents 87fc668 + 639cd8d commit 93905d3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

builtin/index-pack.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static LIST_HEAD(done_head);
100100
static size_t base_cache_used;
101101
static size_t base_cache_limit;
102102

103-
struct thread_local {
103+
struct thread_local_data {
104104
pthread_t thread;
105105
int pack_fd;
106106
};
@@ -123,7 +123,7 @@ static struct object_entry *objects;
123123
static struct object_stat *obj_stat;
124124
static struct ofs_delta_entry *ofs_deltas;
125125
static struct ref_delta_entry *ref_deltas;
126-
static struct thread_local nothread_data;
126+
static struct thread_local_data nothread_data;
127127
static int nr_objects;
128128
static int nr_ofs_deltas;
129129
static int nr_ref_deltas;
@@ -161,7 +161,7 @@ static const char *curr_pack;
161161
static struct oidset local_links = OIDSET_INIT;
162162
static int record_local_links;
163163

164-
static struct thread_local *thread_data;
164+
static struct thread_local_data *thread_data;
165165
static int nr_dispatched;
166166
static int threads_active;
167167

@@ -403,7 +403,7 @@ static NORETURN void bad_object(off_t offset, const char *format, ...)
403403
(uintmax_t)offset, buf);
404404
}
405405

406-
static inline struct thread_local *get_thread_data(void)
406+
static inline struct thread_local_data *get_thread_data(void)
407407
{
408408
if (HAVE_THREADS) {
409409
if (threads_active)
@@ -414,7 +414,7 @@ static inline struct thread_local *get_thread_data(void)
414414
return &nothread_data;
415415
}
416416

417-
static void set_thread_data(struct thread_local *data)
417+
static void set_thread_data(struct thread_local_data *data)
418418
{
419419
if (threads_active)
420420
pthread_setspecific(key, data);

reflog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ static void mark_reachable(struct expire_reflog_policy_cb *cb)
210210
cb->mark_list = leftover;
211211
}
212212

213-
static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit, struct object_id *oid)
213+
static int is_unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit, struct object_id *oid)
214214
{
215215
/*
216216
* We may or may not have the commit yet - if not, look it
@@ -265,7 +265,7 @@ int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
265265
return 1;
266266
case UE_NORMAL:
267267
case UE_HEAD:
268-
if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
268+
if (is_unreachable(cb, old_commit, ooid) || is_unreachable(cb, new_commit, noid))
269269
return 1;
270270
break;
271271
}

0 commit comments

Comments
 (0)