undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck.c: call parse_msg_type() early in fsck_set_msg_type()

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-03-28 15:15:42 +02:00 committed by Junio C Hamano
parent 30cf618eef
commit c72da1a22b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fsck.c
View File

@ -201,11 +201,10 @@ void fsck_set_msg_type(struct fsck_options *options,
const char *msg_id_str, const char *msg_type_str) const char *msg_id_str, const char *msg_type_str)
{ {
int msg_id = parse_msg_id(msg_id_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) if (msg_id < 0)
die("Unhandled message id: %s", msg_id_str); 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) 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); die("Cannot demote %s to %s", msg_id_str, msg_type_str);