t: harmonize t-reftable-block.c with coding guidelines
Harmonize the newly ported test unit-tests/t-reftable-block.c with the following guidelines: - Single line 'for' statements must omit curly braces. - Structs must be 0-initialized with '= { 0 }' instead of '= { NULL }'. - Array sizes and indices should preferably be of type 'size_t'and not 'int'. - Return code variable should preferably be named 'ret', not 'n'. Mentored-by: Patrick Steinhardt <ps@pks.im> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Chandra Pratap committed
Aug 21, 2024 at 18:00 UTC
6853b931bd04d534c7e09073ab39f8192f0dd34e
1 file changed
+26
-26
t/unit-tests/t-reftable-block.c
+26
-26
@@ -16,20 +16,20 @@ static void t_block_read_write(void)
16
{
17
const int header_off = 21; /* random */
18
char *names[30];
19
- const int N = ARRAY_SIZE(names);
20
- const int block_size = 1024;
21
- struct reftable_block block = { NULL };
19
+ const size_t N = ARRAY_SIZE(names);
20
+ const size_t block_size = 1024;
21
+ struct reftable_block block = { 0 };
22
struct block_writer bw = {
23
.last_key = STRBUF_INIT,
24
};
25
struct reftable_record rec = {
26
.type = BLOCK_TYPE_REF,
27
};
28
- int i = 0;
29
- int n;
28
+ size_t i = 0;
29
+ int ret;
30
struct block_reader br = { 0 };
31
struct block_iter it = BLOCK_ITER_INIT;
32
- int j = 0;
32
+ size_t j = 0;
33
struct strbuf want = STRBUF_INIT;
34
35
REFTABLE_CALLOC_ARRAY(block.data, block_size);
@@ -40,26 +40,26 @@ static void t_block_read_write(void)
40
41
rec.u.ref.refname = (char *) "";
42
rec.u.ref.value_type = REFTABLE_REF_DELETION;
43
- n = block_writer_add(&bw, &rec);
44
- check_int(n, ==, REFTABLE_API_ERROR);
43
+ ret = block_writer_add(&bw, &rec);
44
+ check_int(ret, ==, REFTABLE_API_ERROR);
45
46
for (i = 0; i < N; i++) {
47
char name[100];
48
- snprintf(name, sizeof(name), "branch%02d", i);
48
+ snprintf(name, sizeof(name), "branch%02"PRIuMAX, (uintmax_t)i);
49
50
rec.u.ref.refname = name;
51
rec.u.ref.value_type = REFTABLE_REF_VAL1;
52
memset(rec.u.ref.value.val1, i, GIT_SHA1_RAWSZ);
53
54
names[i] = xstrdup(name);
55
- n = block_writer_add(&bw, &rec);
55
+ ret = block_writer_add(&bw, &rec);
56
rec.u.ref.refname = NULL;
57
rec.u.ref.value_type = REFTABLE_REF_DELETION;
58
- check_int(n, ==, 0);
58
+ check_int(ret, ==, 0);
59
}
60
61
- n = block_writer_finish(&bw);
62
- check_int(n, >, 0);
61
+ ret = block_writer_finish(&bw);
62
+ check_int(ret, >, 0);
63
64
block_writer_release(&bw);
65
@@ -68,9 +68,10 @@ static void t_block_read_write(void)
68
block_iter_seek_start(&it, &br);
69
70
while (1) {
71
- int r = block_iter_next(&it, &rec);
72
- check_int(r, >=, 0);
73
- if (r > 0) {
71
+ ret = block_iter_next(&it, &rec);
72
+ check_int(ret, >=, 0);
73
+ if (ret > 0) {
74
+ check_int(i, ==, N);
75
break;
76
}
77
check_str(names[j], rec.u.ref.refname);
@@ -85,20 +86,20 @@ static void t_block_read_write(void)
86
strbuf_reset(&want);
87
strbuf_addstr(&want, names[i]);
88
88
- n = block_iter_seek_key(&it, &br, &want);
89
- check_int(n, ==, 0);
89
+ ret = block_iter_seek_key(&it, &br, &want);
90
+ check_int(ret, ==, 0);
91
91
- n = block_iter_next(&it, &rec);
92
- check_int(n, ==, 0);
92
+ ret = block_iter_next(&it, &rec);
93
+ check_int(ret, ==, 0);
94
95
check_str(names[i], rec.u.ref.refname);
96
97
want.len--;
97
- n = block_iter_seek_key(&it, &br, &want);
98
- check_int(n, ==, 0);
98
+ ret = block_iter_seek_key(&it, &br, &want);
99
+ check_int(ret, ==, 0);
100
100
- n = block_iter_next(&it, &rec);
101
- check_int(n, ==, 0);
101
+ ret = block_iter_next(&it, &rec);
102
+ check_int(ret, ==, 0);
103
check_str(names[10 * (i / 10)], rec.u.ref.refname);
104
105
block_iter_close(&it);
@@ -107,9 +108,8 @@ static void t_block_read_write(void)
108
reftable_record_release(&rec);
109
reftable_block_done(&br.block);
110
strbuf_release(&want);
110
- for (i = 0; i < N; i++) {
111
+ for (i = 0; i < N; i++)
112
reftable_free(names[i]);
112
- }
113
}
114
115
int cmd_main(int argc, const char *argv[])