Re: [PATCH v4 08/22] fsck.c: move definition of msg_id into append_msg_id()
From: Junio C Hamano <hidden>
Date: 2021-03-17 18:46:09
Ævar Arnfjörð Bjarmason [off-list ref] writes:
Refactor code added in 71ab8fa840f (fsck: report the ID of the error/warning, 2015-06-22) to resolve the msg_id to a string in the function that wants it, instead of doing it in report().
This reintroduces the same confusion 07/22 tried to get rid of, unless msg_id variable is renamed to msg_id_str in this step, instead of being left to the next step, no?
quoted hunk
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- fsck.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)diff --git a/fsck.c b/fsck.c index 0a9ac9ca07..b977493f57 100644 --- a/fsck.c +++ b/fsck.c@@ -264,8 +264,9 @@ void fsck_set_msg_types(struct fsck_options *options, const char *values) free(to_free); } -static void append_msg_id(struct strbuf *sb, const char *msg_id) +static void append_msg_id(struct strbuf *sb, enum fsck_msg_id id) { + const char *msg_id = msg_id_info[id].id_string; for (;;) { char c = *(msg_id)++;@@ -308,7 +309,7 @@ static int report(struct fsck_options *options, else if (msg_type == FSCK_INFO) msg_type = FSCK_WARN; - append_msg_id(&sb, msg_id_info[id].id_string); + append_msg_id(&sb, id); va_start(ap, fmt); strbuf_vaddf(&sb, fmt, ap);