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>
Ævar Arnfjörð Bjarmason committed
Mar 28, 2021 at 15:15 UTC
c72da1a22bb3996ab8740b91ad2af6a54bd22777
1 file changed
+1
-2
fsck.c
+1
-2
@@ -201,11 +201,10 @@ void fsck_set_msg_type(struct fsck_options *options,
201
const char *msg_id_str, const char *msg_type_str)
202
{
203
int msg_id = parse_msg_id(msg_id_str);
204
- enum fsck_msg_type msg_type;
204
+ enum fsck_msg_type msg_type = parse_msg_type(msg_type_str);
205
206
if (msg_id < 0)
207
die("Unhandled message id: %s", msg_id_str);
208
- msg_type = parse_msg_type(msg_type_str);
208
209
if (msg_type != FSCK_ERROR && msg_id_info[msg_id].msg_type == FSCK_FATAL)
210
die("Cannot demote %s to %s", msg_id_str, msg_type_str);