Skip to content

Commit 92f4809

Browse files
avargitster
authored andcommitted
multi-pack-index: refactor "goto usage" pattern
Refactor the "goto usage" pattern added in cd57bc4 (builtin/multi-pack-index.c: display usage on unrecognized command, 2021-03-30) and 88617d1 (multi-pack-index: fix potential segfault without sub-command, 2021-07-19) to maintain the same brevity, but in a form that doesn't run afoul of the recommendation in CodingGuidelines about braces: When there are multiple arms to a conditional and some of them require braces, enclose even a single line block in braces for consistency[...] Let's also change "argv == 0" to juts "!argv", per: Do not explicitly compare an integral value with constant 0 or '\0', or a pointer value with constant NULL[...] I'm changing this because in a subsequent commit I'll make builtin/commit-graph.c use the same pattern, having the two similarly structured commands match aids readability. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Reviewed-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 84e4484 commit 92f4809

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

builtin/multi-pack-index.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ int cmd_multi_pack_index(int argc, const char **argv,
164164
if (!opts.object_dir)
165165
opts.object_dir = get_object_directory();
166166

167-
if (argc == 0)
167+
if (!argc)
168168
goto usage;
169169

170170
if (!strcmp(argv[0], "repack"))
@@ -175,10 +175,9 @@ int cmd_multi_pack_index(int argc, const char **argv,
175175
return cmd_multi_pack_index_verify(argc, argv);
176176
else if (!strcmp(argv[0], "expire"))
177177
return cmd_multi_pack_index_expire(argc, argv);
178-
else {
179-
error(_("unrecognized subcommand: %s"), argv[0]);
178+
179+
error(_("unrecognized subcommand: %s"), argv[0]);
180180
usage:
181-
usage_with_options(builtin_multi_pack_index_usage,
182-
builtin_multi_pack_index_options);
183-
}
181+
usage_with_options(builtin_multi_pack_index_usage,
182+
builtin_multi_pack_index_options);
184183
}

0 commit comments

Comments
 (0)