kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

reftable: avoid initializing structs from structs 

Apparently, the IBM xlc compiler doesn't like this.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Han-Wen Nienhuys 2022-01-13 16:55:34 +00:00 committed by Junio C Hamano
parent 1ffcbaa1a5
commit f2b255141b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
reftable/merged_test.c
View File

@ -207,11 +207,11 @@ static void test_merged(void)
}, },
}; };


struct reftable_ref_record want[] = { struct reftable_ref_record *want[] = {
r2[0], &r2[0],
r1[1], &r1[1],
r3[0], &r3[0],
r3[1], &r3[1],
}; };


struct reftable_ref_record *refs[] = { r1, r2, r3 }; struct reftable_ref_record *refs[] = { r1, r2, r3 };
@ -250,7 +250,7 @@ static void test_merged(void)


EXPECT(ARRAY_SIZE(want) == len); EXPECT(ARRAY_SIZE(want) == len);
for (i = 0; i < len; i++) { 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)); GIT_SHA1_RAWSZ));
} }
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -345,10 +345,10 @@ static void test_merged_logs(void)
.value_type = REFTABLE_LOG_DELETION, .value_type = REFTABLE_LOG_DELETION,
}, },
}; };
struct reftable_log_record want[] = { struct reftable_log_record *want[] = {
r2[0], &r2[0],
r3[0], &r3[0],
r1[1], &r1[1],
}; };


struct reftable_log_record *logs[] = { r1, r2, r3 }; struct reftable_log_record *logs[] = { r1, r2, r3 };
@ -387,7 +387,7 @@ static void test_merged_logs(void)


EXPECT(ARRAY_SIZE(want) == len); EXPECT(ARRAY_SIZE(want) == len);
for (i = 0; i < len; i++) { 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)); GIT_SHA1_RAWSZ));
} }