From f2b255141b3008a46b4946e7da44b966797e4355 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 13 Jan 2022 16:55:34 +0000 Subject: [PATCH 1/2] reftable: avoid initializing structs from structs Apparently, the IBM xlc compiler doesn't like this. Signed-off-by: Han-Wen Nienhuys Signed-off-by: Junio C Hamano --- reftable/merged_test.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/reftable/merged_test.c b/reftable/merged_test.c index 24461e8a80..abd34849fc 100644 --- a/reftable/merged_test.c +++ b/reftable/merged_test.c @@ -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)); } From 22d2f70e85e767abba2e284e32c0edb7f749e29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 11 Jan 2022 17:40:23 +0100 Subject: [PATCH 2/2] reftable tests: avoid "int" overflow, use "uint64_t" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change code added in 1ae2b8cda84 (reftable: add merged table view, 2021-10-07) to consistently use the "uint64_t" type. These "min" and "max" variables get passed in the body of this function to a function whose prototype is: [...] reftable_writer_set_limits([...], uint64_t min, uint64_t max This avoids the following warning on SunCC 12.5 on gcc211.fsffrance.org: "reftable/merged_test.c", line 27: warning: initializer does not fit or is out of range: 0xffffffff Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- reftable/merged_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reftable/merged_test.c b/reftable/merged_test.c index abd34849fc..d08c16abef 100644 --- a/reftable/merged_test.c +++ b/reftable/merged_test.c @@ -24,8 +24,8 @@ license that can be found in the LICENSE file or at 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;