diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-03-28 15:15:40 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-28 19:03:10 -0700 |
| commit | 1b32b59f9bd78b3475195a6e99c629a5ffefdea0 (patch) | |
| tree | 40abab6619ea51e264aa8c605757851358865f5a /builtin/mktag.c | |
| parent | fsck.c: refactor fsck_msg_type() to limit scope of "int msg_type" (diff) | |
| download | tgif-1b32b59f9bd78b3475195a6e99c629a5ffefdea0.tar.xz | |
fsck.h: move FSCK_{FATAL,INFO,ERROR,WARN,IGNORE} into an enum
Move the FSCK_{FATAL,INFO,ERROR,WARN,IGNORE} defines into a new
fsck_msg_type enum.
These defines were originally introduced in:
- ba002f3b28a (builtin-fsck: move common object checking code to
fsck.c, 2008-02-25)
- f50c4407305 (fsck: disallow demoting grave fsck errors to warnings,
2015-06-22)
- efaba7cc77f (fsck: optionally ignore specific fsck issues
completely, 2015-06-22)
- f27d05b1704 (fsck: allow upgrading fsck warnings to errors,
2015-06-22)
The reason these were defined in two different places is because we
use FSCK_{IGNORE,INFO,FATAL} only in fsck.c, but FSCK_{ERROR,WARN} are
used by external callbacks.
Untangling that would take some more work, since we expose the new
"enum fsck_msg_type" to both. Similar to "enum object_type" it's not
worth structuring the API in such a way that only those who need
FSCK_{ERROR,WARN} pass around a different type.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mktag.c')
| -rw-r--r-- | builtin/mktag.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mktag.c b/builtin/mktag.c index 23c4b8763f..052a510ad7 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -17,7 +17,8 @@ static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT; static int mktag_fsck_error_func(struct fsck_options *o, const struct object_id *oid, enum object_type object_type, - int msg_type, const char *message) + enum fsck_msg_type msg_type, + const char *message) { switch (msg_type) { case FSCK_WARN: |