diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-03-28 15:15:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-28 19:03:10 -0700 |
| commit | c72da1a22bb3996ab8740b91ad2af6a54bd22777 (patch) | |
| tree | d7c99c9267b6d0afbdd4726994fa5a4f038171ec | |
| parent | fsck.h: re-order and re-assign "enum fsck_msg_type" (diff) | |
| download | tgif-c72da1a22bb3996ab8740b91ad2af6a54bd22777.tar.xz | |
fsck.c: call parse_msg_type() early in fsck_set_msg_type()
There's no reason to defer the calling of parse_msg_type() until after
we've checked if the "id < 0". This is not a hot codepath, and
parse_msg_type() itself may die on invalid input.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | fsck.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -201,11 +201,10 @@ void fsck_set_msg_type(struct fsck_options *options, const char *msg_id_str, const char *msg_type_str) { int msg_id = parse_msg_id(msg_id_str); - enum fsck_msg_type msg_type; + enum fsck_msg_type msg_type = parse_msg_type(msg_type_str); if (msg_id < 0) die("Unhandled message id: %s", msg_id_str); - msg_type = parse_msg_type(msg_type_str); if (msg_type != FSCK_ERROR && msg_id_info[msg_id].msg_type == FSCK_FATAL) die("Cannot demote %s to %s", msg_id_str, msg_type_str); |