Skip to content

Commit 44e07da

Browse files
avargitster
avar
authored and
gitster
committed
fsck.[ch]: move FOREACH_FSCK_MSG_ID & fsck_msg_id from *.c to *.h
Move the FOREACH_FSCK_MSG_ID macro and the fsck_msg_id enum it helps define from fsck.c to fsck.h. This is in preparation for having non-static functions take the fsck_msg_id as an argument. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 901f2f6 commit 44e07da

File tree

2 files changed

+66
-66
lines changed

2 files changed

+66
-66
lines changed

‎fsck.c

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -22,72 +22,6 @@
2222
static struct oidset gitmodules_found = OIDSET_INIT;
2323
static struct oidset gitmodules_done = OIDSET_INIT;
2424

25-
#define FOREACH_FSCK_MSG_ID(FUNC) \
26-
/* fatal errors */ \
27-
FUNC(NUL_IN_HEADER, FATAL) \
28-
FUNC(UNTERMINATED_HEADER, FATAL) \
29-
/* errors */ \
30-
FUNC(BAD_DATE, ERROR) \
31-
FUNC(BAD_DATE_OVERFLOW, ERROR) \
32-
FUNC(BAD_EMAIL, ERROR) \
33-
FUNC(BAD_NAME, ERROR) \
34-
FUNC(BAD_OBJECT_SHA1, ERROR) \
35-
FUNC(BAD_PARENT_SHA1, ERROR) \
36-
FUNC(BAD_TAG_OBJECT, ERROR) \
37-
FUNC(BAD_TIMEZONE, ERROR) \
38-
FUNC(BAD_TREE, ERROR) \
39-
FUNC(BAD_TREE_SHA1, ERROR) \
40-
FUNC(BAD_TYPE, ERROR) \
41-
FUNC(DUPLICATE_ENTRIES, ERROR) \
42-
FUNC(MISSING_AUTHOR, ERROR) \
43-
FUNC(MISSING_COMMITTER, ERROR) \
44-
FUNC(MISSING_EMAIL, ERROR) \
45-
FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
46-
FUNC(MISSING_OBJECT, ERROR) \
47-
FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
48-
FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
49-
FUNC(MISSING_TAG, ERROR) \
50-
FUNC(MISSING_TAG_ENTRY, ERROR) \
51-
FUNC(MISSING_TREE, ERROR) \
52-
FUNC(MISSING_TREE_OBJECT, ERROR) \
53-
FUNC(MISSING_TYPE, ERROR) \
54-
FUNC(MISSING_TYPE_ENTRY, ERROR) \
55-
FUNC(MULTIPLE_AUTHORS, ERROR) \
56-
FUNC(TREE_NOT_SORTED, ERROR) \
57-
FUNC(UNKNOWN_TYPE, ERROR) \
58-
FUNC(ZERO_PADDED_DATE, ERROR) \
59-
FUNC(GITMODULES_MISSING, ERROR) \
60-
FUNC(GITMODULES_BLOB, ERROR) \
61-
FUNC(GITMODULES_LARGE, ERROR) \
62-
FUNC(GITMODULES_NAME, ERROR) \
63-
FUNC(GITMODULES_SYMLINK, ERROR) \
64-
FUNC(GITMODULES_URL, ERROR) \
65-
FUNC(GITMODULES_PATH, ERROR) \
66-
FUNC(GITMODULES_UPDATE, ERROR) \
67-
/* warnings */ \
68-
FUNC(BAD_FILEMODE, WARN) \
69-
FUNC(EMPTY_NAME, WARN) \
70-
FUNC(FULL_PATHNAME, WARN) \
71-
FUNC(HAS_DOT, WARN) \
72-
FUNC(HAS_DOTDOT, WARN) \
73-
FUNC(HAS_DOTGIT, WARN) \
74-
FUNC(NULL_SHA1, WARN) \
75-
FUNC(ZERO_PADDED_FILEMODE, WARN) \
76-
FUNC(NUL_IN_COMMIT, WARN) \
77-
/* infos (reported as warnings, but ignored by default) */ \
78-
FUNC(GITMODULES_PARSE, INFO) \
79-
FUNC(BAD_TAG_NAME, INFO) \
80-
FUNC(MISSING_TAGGER_ENTRY, INFO) \
81-
/* ignored (elevated when requested) */ \
82-
FUNC(EXTRA_HEADER_ENTRY, IGNORE)
83-
84-
#define MSG_ID(id, msg_type) FSCK_MSG_##id,
85-
enum fsck_msg_id {
86-
FOREACH_FSCK_MSG_ID(MSG_ID)
87-
FSCK_MSG_MAX
88-
};
89-
#undef MSG_ID
90-
9125
#define STR(x) #x
9226
#define MSG_ID(id, msg_type) { STR(id), NULL, NULL, FSCK_##msg_type },
9327
static struct {

‎fsck.h

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,72 @@ enum fsck_msg_type {
1313
FSCK_WARN,
1414
};
1515

16+
#define FOREACH_FSCK_MSG_ID(FUNC) \
17+
/* fatal errors */ \
18+
FUNC(NUL_IN_HEADER, FATAL) \
19+
FUNC(UNTERMINATED_HEADER, FATAL) \
20+
/* errors */ \
21+
FUNC(BAD_DATE, ERROR) \
22+
FUNC(BAD_DATE_OVERFLOW, ERROR) \
23+
FUNC(BAD_EMAIL, ERROR) \
24+
FUNC(BAD_NAME, ERROR) \
25+
FUNC(BAD_OBJECT_SHA1, ERROR) \
26+
FUNC(BAD_PARENT_SHA1, ERROR) \
27+
FUNC(BAD_TAG_OBJECT, ERROR) \
28+
FUNC(BAD_TIMEZONE, ERROR) \
29+
FUNC(BAD_TREE, ERROR) \
30+
FUNC(BAD_TREE_SHA1, ERROR) \
31+
FUNC(BAD_TYPE, ERROR) \
32+
FUNC(DUPLICATE_ENTRIES, ERROR) \
33+
FUNC(MISSING_AUTHOR, ERROR) \
34+
FUNC(MISSING_COMMITTER, ERROR) \
35+
FUNC(MISSING_EMAIL, ERROR) \
36+
FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
37+
FUNC(MISSING_OBJECT, ERROR) \
38+
FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
39+
FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
40+
FUNC(MISSING_TAG, ERROR) \
41+
FUNC(MISSING_TAG_ENTRY, ERROR) \
42+
FUNC(MISSING_TREE, ERROR) \
43+
FUNC(MISSING_TREE_OBJECT, ERROR) \
44+
FUNC(MISSING_TYPE, ERROR) \
45+
FUNC(MISSING_TYPE_ENTRY, ERROR) \
46+
FUNC(MULTIPLE_AUTHORS, ERROR) \
47+
FUNC(TREE_NOT_SORTED, ERROR) \
48+
FUNC(UNKNOWN_TYPE, ERROR) \
49+
FUNC(ZERO_PADDED_DATE, ERROR) \
50+
FUNC(GITMODULES_MISSING, ERROR) \
51+
FUNC(GITMODULES_BLOB, ERROR) \
52+
FUNC(GITMODULES_LARGE, ERROR) \
53+
FUNC(GITMODULES_NAME, ERROR) \
54+
FUNC(GITMODULES_SYMLINK, ERROR) \
55+
FUNC(GITMODULES_URL, ERROR) \
56+
FUNC(GITMODULES_PATH, ERROR) \
57+
FUNC(GITMODULES_UPDATE, ERROR) \
58+
/* warnings */ \
59+
FUNC(BAD_FILEMODE, WARN) \
60+
FUNC(EMPTY_NAME, WARN) \
61+
FUNC(FULL_PATHNAME, WARN) \
62+
FUNC(HAS_DOT, WARN) \
63+
FUNC(HAS_DOTDOT, WARN) \
64+
FUNC(HAS_DOTGIT, WARN) \
65+
FUNC(NULL_SHA1, WARN) \
66+
FUNC(ZERO_PADDED_FILEMODE, WARN) \
67+
FUNC(NUL_IN_COMMIT, WARN) \
68+
/* infos (reported as warnings, but ignored by default) */ \
69+
FUNC(GITMODULES_PARSE, INFO) \
70+
FUNC(BAD_TAG_NAME, INFO) \
71+
FUNC(MISSING_TAGGER_ENTRY, INFO) \
72+
/* ignored (elevated when requested) */ \
73+
FUNC(EXTRA_HEADER_ENTRY, IGNORE)
74+
75+
#define MSG_ID(id, msg_type) FSCK_MSG_##id,
76+
enum fsck_msg_id {
77+
FOREACH_FSCK_MSG_ID(MSG_ID)
78+
FSCK_MSG_MAX
79+
};
80+
#undef MSG_ID
81+
1682
struct fsck_options;
1783
struct object;
1884

0 commit comments

Comments
 (0)