mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t: harmonize t-reftable-stack.c with coding guidelines

Browse Source 
Harmonize the newly ported test unit-tests/t-reftable-stack.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'.
- Function pointers should be passed as 'func' and not '&func'.

While at it, remove initialization for those variables that are
re-used multiple times, like loop variables.

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>
This commit is contained in:
Chandra Pratap
2024-09-08 09:35:57 +05:30
committed by Junio C Hamano
parent 15e29ea1c6
commit e4e384f68d
1 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
t/unit-tests/t-reftable-stack.c
View File

@ -81,7 +81,6 @@ static void t_read_file(void)
int n, err; int n, err;
char **names = NULL; char **names = NULL;
const char *want[] = { "line1", "line2", "line3" }; const char *want[] = { "line1", "line2", "line3" };
int i = 0;
check_int(fd, >, 0); check_int(fd, >, 0);
n = write_in_full(fd, out, strlen(out)); n = write_in_full(fd, out, strlen(out));
@ -92,9 +91,8 @@ static void t_read_file(void)
err = read_lines(fn, &names); err = read_lines(fn, &names);
check(!err); check(!err);
for (i = 0; names[i]; i++) { for (size_t i = 0; names[i]; i++)
check_str(want[i], names[i]); check_str(want[i], names[i]);
}
free_names(names); free_names(names);
(void) remove(fn); (void) remove(fn);
} }
@ -123,7 +121,7 @@ static void write_n_ref_tables(struct reftable_stack *st,
}; };
strbuf_reset(&buf); strbuf_reset(&buf);
strbuf_addf(&buf, "refs/heads/branch-%04u", (unsigned) i); strbuf_addf(&buf, "refs/heads/branch-%04"PRIuMAX, (uintmax_t)i);
ref.refname = buf.buf; ref.refname = buf.buf;
set_test_hash(ref.value.val1, i); set_test_hash(ref.value.val1, i);
@ -164,12 +162,12 @@ static void t_reftable_stack_add_one(void)
.value_type = REFTABLE_REF_SYMREF, .value_type = REFTABLE_REF_SYMREF,
.value.symref = (char *) "master", .value.symref = (char *) "master",
}; };
struct reftable_ref_record dest = { NULL }; struct reftable_ref_record dest = { 0 };
struct stat stat_result = { 0 }; struct stat stat_result = { 0 };
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
err = reftable_stack_add(st, &write_test_ref, &ref); err = reftable_stack_add(st, write_test_ref, &ref);
check(!err); check(!err);
err = reftable_stack_read_ref(st, ref.refname, &dest); err = reftable_stack_read_ref(st, ref.refname, &dest);
@ -234,16 +232,16 @@ static void t_reftable_stack_uptodate(void)
err = reftable_new_stack(&st2, dir, &opts); err = reftable_new_stack(&st2, dir, &opts);
check(!err); check(!err);
err = reftable_stack_add(st1, &write_test_ref, &ref1); err = reftable_stack_add(st1, write_test_ref, &ref1);
check(!err); check(!err);
err = reftable_stack_add(st2, &write_test_ref, &ref2); err = reftable_stack_add(st2, write_test_ref, &ref2);
check_int(err, ==, REFTABLE_OUTDATED_ERROR); check_int(err, ==, REFTABLE_OUTDATED_ERROR);
err = reftable_stack_reload(st2); err = reftable_stack_reload(st2);
check(!err); check(!err);
err = reftable_stack_add(st2, &write_test_ref, &ref2); err = reftable_stack_add(st2, write_test_ref, &ref2);
check(!err); check(!err);
reftable_stack_destroy(st1); reftable_stack_destroy(st1);
reftable_stack_destroy(st2); reftable_stack_destroy(st2);
@ -264,7 +262,7 @@ static void t_reftable_stack_transaction_api(void)
.value_type = REFTABLE_REF_SYMREF, .value_type = REFTABLE_REF_SYMREF,
.value.symref = (char *) "master", .value.symref = (char *) "master",
}; };
struct reftable_ref_record dest = { NULL }; struct reftable_ref_record dest = { 0 };
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
@ -274,7 +272,7 @@ static void t_reftable_stack_transaction_api(void)
err = reftable_stack_new_addition(&add, st); err = reftable_stack_new_addition(&add, st);
check(!err); check(!err);
err = reftable_addition_add(add, &write_test_ref, &ref); err = reftable_addition_add(add, write_test_ref, &ref);
check(!err); check(!err);
err = reftable_addition_commit(add); err = reftable_addition_commit(add);
@ -298,12 +296,13 @@ static void t_reftable_stack_transaction_api_performs_auto_compaction(void)
struct reftable_write_options opts = {0}; struct reftable_write_options opts = {0};
struct reftable_addition *add = NULL; struct reftable_addition *add = NULL;
struct reftable_stack *st = NULL; struct reftable_stack *st = NULL;
int i, n = 20, err; size_t n = 20;
int err;
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
for (i = 0; i <= n; i++) { for (size_t i = 0; i <= n; i++) {
struct reftable_ref_record ref = { struct reftable_ref_record ref = {
.update_index = reftable_stack_next_update_index(st), .update_index = reftable_stack_next_update_index(st),
.value_type = REFTABLE_REF_SYMREF, .value_type = REFTABLE_REF_SYMREF,
@ -311,7 +310,7 @@ static void t_reftable_stack_transaction_api_performs_auto_compaction(void)
}; };
char name[100]; char name[100];
snprintf(name, sizeof(name), "branch%04d", i); snprintf(name, sizeof(name), "branch%04"PRIuMAX, (uintmax_t)i);
ref.refname = name; ref.refname = name;
/* /*
@ -324,7 +323,7 @@ static void t_reftable_stack_transaction_api_performs_auto_compaction(void)
err = reftable_stack_new_addition(&add, st); err = reftable_stack_new_addition(&add, st);
check(!err); check(!err);
err = reftable_addition_add(add, &write_test_ref, &ref); err = reftable_addition_add(add, write_test_ref, &ref);
check(!err); check(!err);
err = reftable_addition_commit(add); err = reftable_addition_commit(add);
@ -355,7 +354,7 @@ static void t_reftable_stack_auto_compaction_fails_gracefully(void)
.value_type = REFTABLE_REF_VAL1, .value_type = REFTABLE_REF_VAL1,
.value.val1 = {0x01}, .value.val1 = {0x01},
}; };
struct reftable_write_options opts = {0}; struct reftable_write_options opts = { 0 };
struct reftable_stack *st; struct reftable_stack *st;
struct strbuf table_path = STRBUF_INIT; struct strbuf table_path = STRBUF_INIT;
char *dir = get_tmp_dir(__LINE__); char *dir = get_tmp_dir(__LINE__);
@ -417,10 +416,10 @@ static void t_reftable_stack_update_index_check(void)
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
err = reftable_stack_add(st, &write_test_ref, &ref1); err = reftable_stack_add(st, write_test_ref, &ref1);
check(!err); check(!err);
err = reftable_stack_add(st, &write_test_ref, &ref2); err = reftable_stack_add(st, write_test_ref, &ref2);
check_int(err, ==, REFTABLE_API_ERROR); check_int(err, ==, REFTABLE_API_ERROR);
reftable_stack_destroy(st); reftable_stack_destroy(st);
clear_dir(dir); clear_dir(dir);
@ -436,7 +435,7 @@ static void t_reftable_stack_lock_failure(void)
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
for (i = -1; i != REFTABLE_EMPTY_TABLE_ERROR; i--) { for (i = -1; i != REFTABLE_EMPTY_TABLE_ERROR; i--) {
err = reftable_stack_add(st, &write_error, &i); err = reftable_stack_add(st, write_error, &i);
check_int(err, ==, i); check_int(err, ==, i);
} }
@ -446,7 +445,6 @@ static void t_reftable_stack_lock_failure(void)
static void t_reftable_stack_add(void) static void t_reftable_stack_add(void)
{ {
int i = 0;
int err = 0; int err = 0;
struct reftable_write_options opts = { struct reftable_write_options opts = {
.exact_log_message = 1, .exact_log_message = 1,
@ -455,18 +453,18 @@ static void t_reftable_stack_add(void)
}; };
struct reftable_stack *st = NULL; struct reftable_stack *st = NULL;
char *dir = get_tmp_dir(__LINE__); char *dir = get_tmp_dir(__LINE__);
struct reftable_ref_record refs[2] = { { NULL } }; struct reftable_ref_record refs[2] = { 0 };
struct reftable_log_record logs[2] = { { NULL } }; struct reftable_log_record logs[2] = { 0 };
struct strbuf path = STRBUF_INIT; struct strbuf path = STRBUF_INIT;
struct stat stat_result; struct stat stat_result;
int N = ARRAY_SIZE(refs); size_t i, N = ARRAY_SIZE(refs);
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
for (i = 0; i < N; i++) { for (i = 0; i < N; i++) {
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), "branch%02d", i); snprintf(buf, sizeof(buf), "branch%02"PRIuMAX, (uintmax_t)i);
refs[i].refname = xstrdup(buf); refs[i].refname = xstrdup(buf);
refs[i].update_index = i + 1; refs[i].update_index = i + 1;
refs[i].value_type = REFTABLE_REF_VAL1; refs[i].value_type = REFTABLE_REF_VAL1;
@ -480,7 +478,7 @@ static void t_reftable_stack_add(void)
} }
for (i = 0; i < N; i++) { for (i = 0; i < N; i++) {
int err = reftable_stack_add(st, &write_test_ref, &refs[i]); int err = reftable_stack_add(st, write_test_ref, &refs[i]);
check(!err); check(!err);
} }
@ -489,7 +487,7 @@ static void t_reftable_stack_add(void)
.log = &logs[i], .log = &logs[i],
.update_index = reftable_stack_next_update_index(st), .update_index = reftable_stack_next_update_index(st),
}; };
int err = reftable_stack_add(st, &write_test_log, &arg); int err = reftable_stack_add(st, write_test_log, &arg);
check(!err); check(!err);
} }
@ -497,7 +495,7 @@ static void t_reftable_stack_add(void)
check(!err); check(!err);
for (i = 0; i < N; i++) { for (i = 0; i < N; i++) {
struct reftable_ref_record dest = { NULL }; struct reftable_ref_record dest = { 0 };
int err = reftable_stack_read_ref(st, refs[i].refname, &dest); int err = reftable_stack_read_ref(st, refs[i].refname, &dest);
check(!err); check(!err);
@ -507,7 +505,7 @@ static void t_reftable_stack_add(void)
} }
for (i = 0; i < N; i++) { for (i = 0; i < N; i++) {
struct reftable_log_record dest = { NULL }; struct reftable_log_record dest = { 0 };
int err = reftable_stack_read_log(st, refs[i].refname, &dest); int err = reftable_stack_read_log(st, refs[i].refname, &dest);
check(!err); check(!err);
check(reftable_log_record_equal(&dest, logs + i, check(reftable_log_record_equal(&dest, logs + i,
@ -575,11 +573,11 @@ static void t_reftable_stack_log_normalize(void)
check(!err); check(!err);
input.value.update.message = (char *) "one\ntwo"; input.value.update.message = (char *) "one\ntwo";
err = reftable_stack_add(st, &write_test_log, &arg); err = reftable_stack_add(st, write_test_log, &arg);
check_int(err, ==, REFTABLE_API_ERROR); check_int(err, ==, REFTABLE_API_ERROR);
input.value.update.message = (char *) "one"; input.value.update.message = (char *) "one";
err = reftable_stack_add(st, &write_test_log, &arg); err = reftable_stack_add(st, write_test_log, &arg);
check(!err); check(!err);
err = reftable_stack_read_log(st, input.refname, &dest); err = reftable_stack_read_log(st, input.refname, &dest);
@ -588,7 +586,7 @@ static void t_reftable_stack_log_normalize(void)
input.value.update.message = (char *) "two\n"; input.value.update.message = (char *) "two\n";
arg.update_index = 2; arg.update_index = 2;
err = reftable_stack_add(st, &write_test_log, &arg); err = reftable_stack_add(st, write_test_log, &arg);
check(!err); check(!err);
err = reftable_stack_read_log(st, input.refname, &dest); err = reftable_stack_read_log(st, input.refname, &dest);
check(!err); check(!err);
@ -602,16 +600,15 @@ static void t_reftable_stack_log_normalize(void)
static void t_reftable_stack_tombstone(void) static void t_reftable_stack_tombstone(void)
{ {
int i = 0;
char *dir = get_tmp_dir(__LINE__); char *dir = get_tmp_dir(__LINE__);
struct reftable_write_options opts = { 0 }; struct reftable_write_options opts = { 0 };
struct reftable_stack *st = NULL; struct reftable_stack *st = NULL;
int err; int err;
struct reftable_ref_record refs[2] = { { NULL } }; struct reftable_ref_record refs[2] = { 0 };
struct reftable_log_record logs[2] = { { NULL } }; struct reftable_log_record logs[2] = { 0 };
int N = ARRAY_SIZE(refs); size_t i, N = ARRAY_SIZE(refs);
struct reftable_ref_record dest = { NULL }; struct reftable_ref_record dest = { 0 };
struct reftable_log_record log_dest = { NULL }; struct reftable_log_record log_dest = { 0 };
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
@ -637,7 +634,7 @@ static void t_reftable_stack_tombstone(void)
} }
} }
for (i = 0; i < N; i++) { for (i = 0; i < N; i++) {
int err = reftable_stack_add(st, &write_test_ref, &refs[i]); int err = reftable_stack_add(st, write_test_ref, &refs[i]);
check(!err); check(!err);
} }
@ -646,7 +643,7 @@ static void t_reftable_stack_tombstone(void)
.log = &logs[i], .log = &logs[i],
.update_index = reftable_stack_next_update_index(st), .update_index = reftable_stack_next_update_index(st),
}; };
int err = reftable_stack_add(st, &write_test_log, &arg); int err = reftable_stack_add(st, write_test_log, &arg);
check(!err); check(!err);
} }
@ -695,12 +692,12 @@ static void t_reftable_stack_hash_id(void)
struct reftable_stack *st32 = NULL; struct reftable_stack *st32 = NULL;
struct reftable_write_options opts_default = { 0 }; struct reftable_write_options opts_default = { 0 };
struct reftable_stack *st_default = NULL; struct reftable_stack *st_default = NULL;
struct reftable_ref_record dest = { NULL }; struct reftable_ref_record dest = { 0 };
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
err = reftable_stack_add(st, &write_test_ref, &ref); err = reftable_stack_add(st, write_test_ref, &ref);
check(!err); check(!err);
/* can't read it with the wrong hash ID. */ /* can't read it with the wrong hash ID. */
@ -743,21 +740,20 @@ static void t_reflog_expire(void)
char *dir = get_tmp_dir(__LINE__); char *dir = get_tmp_dir(__LINE__);
struct reftable_write_options opts = { 0 }; struct reftable_write_options opts = { 0 };
struct reftable_stack *st = NULL; struct reftable_stack *st = NULL;
struct reftable_log_record logs[20] = { { NULL } }; struct reftable_log_record logs[20] = { 0 };
int N = ARRAY_SIZE(logs) - 1; size_t i, N = ARRAY_SIZE(logs) - 1;
int i = 0;
int err; int err;
struct reftable_log_expiry_config expiry = { struct reftable_log_expiry_config expiry = {
.time = 10, .time = 10,
}; };
struct reftable_log_record log = { NULL }; struct reftable_log_record log = { 0 };
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
for (i = 1; i <= N; i++) { for (i = 1; i <= N; i++) {
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), "branch%02d", i); snprintf(buf, sizeof(buf), "branch%02"PRIuMAX, (uintmax_t)i);
logs[i].refname = xstrdup(buf); logs[i].refname = xstrdup(buf);
logs[i].update_index = i; logs[i].update_index = i;
@ -772,7 +768,7 @@ static void t_reflog_expire(void)
.log = &logs[i], .log = &logs[i],
.update_index = reftable_stack_next_update_index(st), .update_index = reftable_stack_next_update_index(st),
}; };
int err = reftable_stack_add(st, &write_test_log, &arg); int err = reftable_stack_add(st, write_test_log, &arg);
check(!err); check(!err);
} }
@ -800,9 +796,8 @@ static void t_reflog_expire(void)
/* cleanup */ /* cleanup */
reftable_stack_destroy(st); reftable_stack_destroy(st);
for (i = 0; i <= N; i++) { for (i = 0; i <= N; i++)
reftable_log_record_release(&logs[i]); reftable_log_record_release(&logs[i]);
}
clear_dir(dir); clear_dir(dir);
reftable_log_record_release(&log); reftable_log_record_release(&log);
} }
@ -824,7 +819,7 @@ static void t_empty_add(void)
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
err = reftable_stack_add(st, &write_nothing, NULL); err = reftable_stack_add(st, write_nothing, NULL);
check(!err); check(!err);
err = reftable_new_stack(&st2, dir, &opts); err = reftable_new_stack(&st2, dir, &opts);
@ -851,8 +846,8 @@ static void t_reftable_stack_auto_compaction(void)
}; };
struct reftable_stack *st = NULL; struct reftable_stack *st = NULL;
char *dir = get_tmp_dir(__LINE__); char *dir = get_tmp_dir(__LINE__);
int err, i; int err;
int N = 100; size_t i, N = 100;
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
@ -865,9 +860,9 @@ static void t_reftable_stack_auto_compaction(void)
.value_type = REFTABLE_REF_SYMREF, .value_type = REFTABLE_REF_SYMREF,
.value.symref = (char *) "master", .value.symref = (char *) "master",
}; };
snprintf(name, sizeof(name), "branch%04d", i); snprintf(name, sizeof(name), "branch%04"PRIuMAX, (uintmax_t)i);
err = reftable_stack_add(st, &write_test_ref, &ref); err = reftable_stack_add(st, write_test_ref, &ref);
check(!err); check(!err);
err = reftable_stack_auto_compact(st); err = reftable_stack_auto_compact(st);
@ -929,7 +924,8 @@ static void t_reftable_stack_add_performs_auto_compaction(void)
struct reftable_stack *st = NULL; struct reftable_stack *st = NULL;
struct strbuf refname = STRBUF_INIT; struct strbuf refname = STRBUF_INIT;
char *dir = get_tmp_dir(__LINE__); char *dir = get_tmp_dir(__LINE__);
int err, i, n = 20; int err;
size_t i, n = 20;
err = reftable_new_stack(&st, dir, &opts); err = reftable_new_stack(&st, dir, &opts);
check(!err); check(!err);
@ -949,10 +945,10 @@ static void t_reftable_stack_add_performs_auto_compaction(void)
st->opts.disable_auto_compact = i != n; st->opts.disable_auto_compact = i != n;
strbuf_reset(&refname); strbuf_reset(&refname);
strbuf_addf(&refname, "branch-%04d", i); strbuf_addf(&refname, "branch-%04"PRIuMAX, (uintmax_t)i);
ref.refname = refname.buf; ref.refname = refname.buf;
err = reftable_stack_add(st, &write_test_ref, &ref); err = reftable_stack_add(st, write_test_ref, &ref);
check(!err); check(!err);
/* /*