mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 20:36:19 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2022-01-14 15:25:15 -08:00
parent 31e3912369 22d2f70e85
commit 9a329bdb49
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
reftable/merged_test.c
View File

@ -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;
@ -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));
}