kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

fsck.c: rename variables in fsck_set_msg_type() for less confusion 

Rename variables in a function added in 0282f4dced (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>
maint
Ævar Arnfjörð Bjarmason 2021-03-28 15:15:36 +02:00 committed by Junio C Hamano
parent a1aad71601
commit f1abc2d0e1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fsck.c
View File

@ -203,27 +203,27 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type)
} }


void fsck_set_msg_type(struct fsck_options *options, void fsck_set_msg_type(struct fsck_options *options,
const char *msg_id, const char *msg_type) const char *msg_id_str, const char *msg_type_str)
{ {
int id = parse_msg_id(msg_id), type; int msg_id = parse_msg_id(msg_id_str), msg_type;


if (id < 0) if (msg_id < 0)
die("Unhandled message id: %s", msg_id); die("Unhandled message id: %s", msg_id_str);
type = parse_msg_type(msg_type); msg_type = parse_msg_type(msg_type_str);


if (type != FSCK_ERROR && msg_id_info[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, msg_type); die("Cannot demote %s to %s", msg_id_str, msg_type_str);


if (!options->msg_type) { if (!options->msg_type) {
int i; int i;
int *msg_type; int *severity;
ALLOC_ARRAY(msg_type, FSCK_MSG_MAX); ALLOC_ARRAY(severity, FSCK_MSG_MAX);
for (i = 0; i < FSCK_MSG_MAX; i++) for (i = 0; i < FSCK_MSG_MAX; i++)
msg_type[i] = fsck_msg_type(i, options); severity[i] = fsck_msg_type(i, options);
options->msg_type = msg_type; options->msg_type = severity;
} }


options->msg_type[id] = type; options->msg_type[msg_id] = msg_type;
} }


void fsck_set_msg_types(struct fsck_options *options, const char *values) void fsck_set_msg_types(struct fsck_options *options, const char *values)

2
fsck.h
View File

@ -11,7 +11,7 @@ struct fsck_options;
struct object; struct object;


void fsck_set_msg_type(struct fsck_options *options, void fsck_set_msg_type(struct fsck_options *options,
const char *msg_id, const char *msg_type); const char *msg_id, const char *msg_type);
void fsck_set_msg_types(struct fsck_options *options, const char *values); void fsck_set_msg_types(struct fsck_options *options, const char *values);
int is_valid_msg_type(const char *msg_id, const char *msg_type); int is_valid_msg_type(const char *msg_id, const char *msg_type);