admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reftable/basics: stop using SWAP() macro

Browse Source 
Stop using `SWAP()` macro in favor of an open-coded variant of it. Note
that this also requires us to open-code the build assert that `SWAP()`
itself uses to verify that the size of both variables matches.

This is done to reduce our dependency on the Git codebase.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-02-18 10:20:49 +01:00
committed by Junio C Hamano
parent 10f2935c7f
commit f8ed12dec4
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
reftable/basics.h
View File

@@ -266,6 +266,15 @@ static inline void *reftable_alloc_grow(void *p, size_t nelem, size_t elsize,
# define strdup(str) REFTABLE_BANNED(strdup)
#endif
#define REFTABLE_SWAP(a, b) do { \
void *_swap_a_ptr = &(a); \
void *_swap_b_ptr = &(b); \
unsigned char _swap_buffer[sizeof(a) - 2 * sizeof(a) * (sizeof(a) != sizeof(b))]; \
memcpy(_swap_buffer, _swap_a_ptr, sizeof(a)); \
memcpy(_swap_a_ptr, _swap_b_ptr, sizeof(a)); \
memcpy(_swap_b_ptr, _swap_buffer, sizeof(a)); \
} while (0)
/* Find the longest shared prefix size of `a` and `b` */
size_t common_prefix_size(struct reftable_buf *a, struct reftable_buf *b);

2
reftable/merged.c
View File

@@ -155,7 +155,7 @@ static int merged_iter_next_entry(struct merged_iter *mi,
}
mi->advance_index = entry.index;
SWAP(*rec, *entry.rec);
REFTABLE_SWAP(*rec, *entry.rec);
return 0;
}

4
reftable/pq.c
View File

@@ -57,7 +57,7 @@ int merged_iter_pqueue_remove(struct merged_iter_pqueue *pq, struct pq_entry *ou
if (min == i)
break;
SWAP(pq->heap[i], pq->heap[min]);
REFTABLE_SWAP(pq->heap[i], pq->heap[min]);
i = min;
}
@@ -81,7 +81,7 @@ int merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry
size_t j = (i - 1) / 2;
if (pq_less(&pq->heap[j], &pq->heap[i]))
break;
SWAP(pq->heap[j], pq->heap[i]);
REFTABLE_SWAP(pq->heap[j], pq->heap[i]);
i = j;
}

16
reftable/record.c
View File

@@ -237,11 +237,11 @@ static int reftable_ref_record_copy_from(void *rec, const void *src_rec,
size_t refname_cap = 0;
int err;
SWAP(refname, ref->refname);
SWAP(refname_cap, ref->refname_cap);
REFTABLE_SWAP(refname, ref->refname);
REFTABLE_SWAP(refname_cap, ref->refname_cap);
reftable_ref_record_release(ref);
SWAP(ref->refname, refname);
SWAP(ref->refname_cap, refname_cap);
REFTABLE_SWAP(ref->refname, refname);
REFTABLE_SWAP(ref->refname_cap, refname_cap);
if (src->refname) {
size_t refname_len = strlen(src->refname);
@@ -376,11 +376,11 @@ static int reftable_ref_record_decode(void *rec, struct reftable_buf key,
return n;
string_view_consume(&in, n);
SWAP(refname, r->refname);
SWAP(refname_cap, r->refname_cap);
REFTABLE_SWAP(refname, r->refname);
REFTABLE_SWAP(refname_cap, r->refname_cap);
reftable_ref_record_release(r);
SWAP(r->refname, refname);
SWAP(r->refname_cap, refname_cap);
REFTABLE_SWAP(r->refname, refname);
REFTABLE_SWAP(r->refname_cap, refname_cap);
REFTABLE_ALLOC_GROW_OR_NULL(r->refname, key.len + 1, r->refname_cap);
if (!r->refname) {