Skip to content

Commit 35af754

Browse files
avargitster
authored andcommitted
fsck.c: rename remaining fsck_msg_id "id" to "msg_id"
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 034a7b7 commit 35af754

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

fsck.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,11 @@ static int object_on_skiplist(struct fsck_options *opts,
273273
__attribute__((format (printf, 5, 6)))
274274
static int report(struct fsck_options *options,
275275
const struct object_id *oid, enum object_type object_type,
276-
enum fsck_msg_id id, const char *fmt, ...)
276+
enum fsck_msg_id msg_id, const char *fmt, ...)
277277
{
278278
va_list ap;
279279
struct strbuf sb = STRBUF_INIT;
280-
int msg_type = fsck_msg_type(id, options), result;
280+
int msg_type = fsck_msg_type(msg_id, options), result;
281281

282282
if (msg_type == FSCK_IGNORE)
283283
return 0;
@@ -291,7 +291,7 @@ static int report(struct fsck_options *options,
291291
msg_type = FSCK_WARN;
292292

293293
prepare_msg_ids();
294-
strbuf_addf(&sb, "%s: ", msg_id_info[id].camelcased);
294+
strbuf_addf(&sb, "%s: ", msg_id_info[msg_id].camelcased);
295295

296296
va_start(ap, fmt);
297297
strbuf_vaddf(&sb, fmt, ap);

0 commit comments

Comments
 (0)