[PATCH v6 06/19] fsck.c: rename remaining fsck_msg_id "id" to "msg_id"
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-03-28 13:17:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
Rename the remaining variables of type fsck_msg_id from "id" to "msg_id". This change is relatively small, and is worth the churn for a later change where we have different id's in the "report" function. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- fsck.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fsck.c b/fsck.c
index 25c697fa6a2..a0463ea22cc 100644
--- a/fsck.c
+++ b/fsck.c@@ -273,11 +273,11 @@ static int object_on_skiplist(struct fsck_options *opts, __attribute__((format (printf, 5, 6))) static int report(struct fsck_options *options, const struct object_id *oid, enum object_type object_type, - enum fsck_msg_id id, const char *fmt, ...) + enum fsck_msg_id msg_id, const char *fmt, ...) { va_list ap; struct strbuf sb = STRBUF_INIT; - int msg_type = fsck_msg_type(id, options), result; + int msg_type = fsck_msg_type(msg_id, options), result; if (msg_type == FSCK_IGNORE) return 0;
@@ -291,7 +291,7 @@ static int report(struct fsck_options *options, msg_type = FSCK_WARN; prepare_msg_ids(); - strbuf_addf(&sb, "%s: ", msg_id_info[id].camelcased); + strbuf_addf(&sb, "%s: ", msg_id_info[msg_id].camelcased); va_start(ap, fmt); strbuf_vaddf(&sb, fmt, ap);
--
2.31.1.445.g087790d4945