diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-15 02:25:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-15 02:25:15 +0300 |
commit | 9a329bdb49628e412dc77af666c864be5fdbba7b (patch) | |
tree | 347446608304c1c529fafe9e5f6745f10bc716bd | |
parent | 31e391236958c2e75787b7579146b3569fb6ec17 (diff) | |
parent | 22d2f70e85e767abba2e284e32c0edb7f749e29c (diff) |
Merge branch 'ab/reftable-build-fixes'
A few portability tweaks.
* ab/reftable-build-fixes:
reftable tests: avoid "int" overflow, use "uint64_t"
reftable: avoid initializing structs from structs
-rw-r--r-- | reftable/merged_test.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/reftable/merged_test.c b/reftable/merged_test.c index 24461e8a80..d08c16abef 100644 --- a/reftable/merged_test.c +++ b/reftable/merged_test.c @@ -24,8 +24,8 @@ https://developers.google.com/open-source/licenses/bsd static void write_test_table(struct strbuf *buf, struct reftable_ref_record refs[], int n) { - int min = 0xffffffff; - int max = 0; + uint64_t min = 0xffffffff; + uint64_t max = 0; int i = 0; int err; @@ -207,11 +207,11 @@ static void test_merged(void) }, }; - struct reftable_ref_record want[] = { - r2[0], - r1[1], - r3[0], - r3[1], + struct reftable_ref_record *want[] = { + &r2[0], + &r1[1], + &r3[0], + &r3[1], }; struct reftable_ref_record *refs[] = { r1, r2, r3 }; @@ -250,7 +250,7 @@ static void test_merged(void) EXPECT(ARRAY_SIZE(want) == len); for (i = 0; i < len; i++) { - EXPECT(reftable_ref_record_equal(&want[i], &out[i], + EXPECT(reftable_ref_record_equal(want[i], &out[i], GIT_SHA1_RAWSZ)); } for (i = 0; i < len; i++) { @@ -345,10 +345,10 @@ static void test_merged_logs(void) .value_type = REFTABLE_LOG_DELETION, }, }; - struct reftable_log_record want[] = { - r2[0], - r3[0], - r1[1], + struct reftable_log_record *want[] = { + &r2[0], + &r3[0], + &r1[1], }; struct reftable_log_record *logs[] = { r1, r2, r3 }; @@ -387,7 +387,7 @@ static void test_merged_logs(void) EXPECT(ARRAY_SIZE(want) == len); for (i = 0; i < len; i++) { - EXPECT(reftable_log_record_equal(&want[i], &out[i], + EXPECT(reftable_log_record_equal(want[i], &out[i], GIT_SHA1_RAWSZ)); } |