fsck.c: rename variables in fsck_set_msg_type() for less confusion
Rename variables in a function added in 0282f4dced0 (fsck: offer a function to demote fsck errors to warnings, 2015-06-22). It was needlessly confusing that it took a "msg_type" argument, but then later declared another "msg_type" of a different type. Let's rename that to "severity", and rename "id" to "msg_id" and "msg_id" to "msg_id_str" etc. This will make a follow-up change smaller. While I'm at it properly indent the fsck_set_msg_type() argument list. 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
f1abc2d0e146dc7f1549fd3ddb119e1b7f0ea645
2 files changed
+13
-13
fsck.c
+12
-12
@@ -203,27 +203,27 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type)
203
}
204
205
void fsck_set_msg_type(struct fsck_options *options,
206
- const char *msg_id, const char *msg_type)
206
+ const char *msg_id_str, const char *msg_type_str)
207
{
208
- int id = parse_msg_id(msg_id), type;
208
+ int msg_id = parse_msg_id(msg_id_str), msg_type;
209
210
- if (id < 0)
211
- die("Unhandled message id: %s", msg_id);
212
- type = parse_msg_type(msg_type);
210
+ if (msg_id < 0)
211
+ die("Unhandled message id: %s", msg_id_str);
212
+ msg_type = parse_msg_type(msg_type_str);
213
214
- if (type != FSCK_ERROR && msg_id_info[id].msg_type == FSCK_FATAL)
215
- die("Cannot demote %s to %s", msg_id, msg_type);
214
+ if (msg_type != FSCK_ERROR && msg_id_info[msg_id].msg_type == FSCK_FATAL)
215
+ die("Cannot demote %s to %s", msg_id_str, msg_type_str);
216
217
if (!options->msg_type) {
218
int i;
219
- int *msg_type;
220
- ALLOC_ARRAY(msg_type, FSCK_MSG_MAX);
219
+ int *severity;
220
+ ALLOC_ARRAY(severity, FSCK_MSG_MAX);
221
for (i = 0; i < FSCK_MSG_MAX; i++)
222
- msg_type[i] = fsck_msg_type(i, options);
223
- options->msg_type = msg_type;
222
+ severity[i] = fsck_msg_type(i, options);
223
+ options->msg_type = severity;
224
}
225
226
- options->msg_type[id] = type;
226
+ options->msg_type[msg_id] = msg_type;
227
}
228
229
void fsck_set_msg_types(struct fsck_options *options, const char *values)
fsck.h
+1
-1
@@ -11,7 +11,7 @@ struct fsck_options;
11
struct object;
12
13
void fsck_set_msg_type(struct fsck_options *options,
14
- const char *msg_id, const char *msg_type);
14
+ const char *msg_id, const char *msg_type);
15
void fsck_set_msg_types(struct fsck_options *options, const char *values);
16
int is_valid_msg_type(const char *msg_id, const char *msg_type);
17