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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fsck.c b/fsck.c
index 31c9088e3f745aa5ce41ffb7bfe021036c8e7cc5..150fe467e4340f72740853141198f80d3b54f9a3 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -22,72 +22,6 @@
 static struct oidset gitmodules_found = OIDSET_INIT;
 static struct oidset gitmodules_done = OIDSET_INIT;
 
-#define FOREACH_FSCK_MSG_ID(FUNC) \
-       /* fatal errors */ \
-       FUNC(NUL_IN_HEADER, FATAL) \
-       FUNC(UNTERMINATED_HEADER, FATAL) \
-       /* errors */ \
-       FUNC(BAD_DATE, ERROR) \
-       FUNC(BAD_DATE_OVERFLOW, ERROR) \
-       FUNC(BAD_EMAIL, ERROR) \
-       FUNC(BAD_NAME, ERROR) \
-       FUNC(BAD_OBJECT_SHA1, ERROR) \
-       FUNC(BAD_PARENT_SHA1, ERROR) \
-       FUNC(BAD_TAG_OBJECT, ERROR) \
-       FUNC(BAD_TIMEZONE, ERROR) \
-       FUNC(BAD_TREE, ERROR) \
-       FUNC(BAD_TREE_SHA1, ERROR) \
-       FUNC(BAD_TYPE, ERROR) \
-       FUNC(DUPLICATE_ENTRIES, ERROR) \
-       FUNC(MISSING_AUTHOR, ERROR) \
-       FUNC(MISSING_COMMITTER, ERROR) \
-       FUNC(MISSING_EMAIL, ERROR) \
-       FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
-       FUNC(MISSING_OBJECT, ERROR) \
-       FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
-       FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
-       FUNC(MISSING_TAG, ERROR) \
-       FUNC(MISSING_TAG_ENTRY, ERROR) \
-       FUNC(MISSING_TREE, ERROR) \
-       FUNC(MISSING_TREE_OBJECT, ERROR) \
-       FUNC(MISSING_TYPE, ERROR) \
-       FUNC(MISSING_TYPE_ENTRY, ERROR) \
-       FUNC(MULTIPLE_AUTHORS, ERROR) \
-       FUNC(TREE_NOT_SORTED, ERROR) \
-       FUNC(UNKNOWN_TYPE, ERROR) \
-       FUNC(ZERO_PADDED_DATE, ERROR) \
-       FUNC(GITMODULES_MISSING, ERROR) \
-       FUNC(GITMODULES_BLOB, ERROR) \
-       FUNC(GITMODULES_LARGE, ERROR) \
-       FUNC(GITMODULES_NAME, ERROR) \
-       FUNC(GITMODULES_SYMLINK, ERROR) \
-       FUNC(GITMODULES_URL, ERROR) \
-       FUNC(GITMODULES_PATH, ERROR) \
-       FUNC(GITMODULES_UPDATE, ERROR) \
-       /* warnings */ \
-       FUNC(BAD_FILEMODE, WARN) \
-       FUNC(EMPTY_NAME, WARN) \
-       FUNC(FULL_PATHNAME, WARN) \
-       FUNC(HAS_DOT, WARN) \
-       FUNC(HAS_DOTDOT, WARN) \
-       FUNC(HAS_DOTGIT, WARN) \
-       FUNC(NULL_SHA1, WARN) \
-       FUNC(ZERO_PADDED_FILEMODE, WARN) \
-       FUNC(NUL_IN_COMMIT, WARN) \
-       /* infos (reported as warnings, but ignored by default) */ \
-       FUNC(GITMODULES_PARSE, INFO) \
-       FUNC(BAD_TAG_NAME, INFO) \
-       FUNC(MISSING_TAGGER_ENTRY, INFO) \
-       /* ignored (elevated when requested) */ \
-       FUNC(EXTRA_HEADER_ENTRY, IGNORE)
-
-#define MSG_ID(id, msg_type) FSCK_MSG_##id,
-enum fsck_msg_id {
-       FOREACH_FSCK_MSG_ID(MSG_ID)
-       FSCK_MSG_MAX
-};
-#undef MSG_ID
-
 #define STR(x) #x
 #define MSG_ID(id, msg_type) { STR(id), NULL, NULL, FSCK_##msg_type },
 static struct {

diff --git a/fsck.h b/fsck.h
index a7e092d3fb4f4c1c59d5f691872e2aedb71e5c26..66c4a71139a97bc5d6ca1b1bcf814a9b1a173da9 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -13,6 +13,72 @@ enum fsck_msg_type {
        FSCK_WARN,
 };
 
+#define FOREACH_FSCK_MSG_ID(FUNC) \
+       /* fatal errors */ \
+       FUNC(NUL_IN_HEADER, FATAL) \
+       FUNC(UNTERMINATED_HEADER, FATAL) \
+       /* errors */ \
+       FUNC(BAD_DATE, ERROR) \
+       FUNC(BAD_DATE_OVERFLOW, ERROR) \
+       FUNC(BAD_EMAIL, ERROR) \
+       FUNC(BAD_NAME, ERROR) \
+       FUNC(BAD_OBJECT_SHA1, ERROR) \
+       FUNC(BAD_PARENT_SHA1, ERROR) \
+       FUNC(BAD_TAG_OBJECT, ERROR) \
+       FUNC(BAD_TIMEZONE, ERROR) \
+       FUNC(BAD_TREE, ERROR) \
+       FUNC(BAD_TREE_SHA1, ERROR) \
+       FUNC(BAD_TYPE, ERROR) \
+       FUNC(DUPLICATE_ENTRIES, ERROR) \
+       FUNC(MISSING_AUTHOR, ERROR) \
+       FUNC(MISSING_COMMITTER, ERROR) \
+       FUNC(MISSING_EMAIL, ERROR) \
+       FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
+       FUNC(MISSING_OBJECT, ERROR) \
+       FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
+       FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
+       FUNC(MISSING_TAG, ERROR) \
+       FUNC(MISSING_TAG_ENTRY, ERROR) \
+       FUNC(MISSING_TREE, ERROR) \
+       FUNC(MISSING_TREE_OBJECT, ERROR) \
+       FUNC(MISSING_TYPE, ERROR) \
+       FUNC(MISSING_TYPE_ENTRY, ERROR) \
+       FUNC(MULTIPLE_AUTHORS, ERROR) \
+       FUNC(TREE_NOT_SORTED, ERROR) \
+       FUNC(UNKNOWN_TYPE, ERROR) \
+       FUNC(ZERO_PADDED_DATE, ERROR) \
+       FUNC(GITMODULES_MISSING, ERROR) \
+       FUNC(GITMODULES_BLOB, ERROR) \
+       FUNC(GITMODULES_LARGE, ERROR) \
+       FUNC(GITMODULES_NAME, ERROR) \
+       FUNC(GITMODULES_SYMLINK, ERROR) \
+       FUNC(GITMODULES_URL, ERROR) \
+       FUNC(GITMODULES_PATH, ERROR) \
+       FUNC(GITMODULES_UPDATE, ERROR) \
+       /* warnings */ \
+       FUNC(BAD_FILEMODE, WARN) \
+       FUNC(EMPTY_NAME, WARN) \
+       FUNC(FULL_PATHNAME, WARN) \
+       FUNC(HAS_DOT, WARN) \
+       FUNC(HAS_DOTDOT, WARN) \
+       FUNC(HAS_DOTGIT, WARN) \
+       FUNC(NULL_SHA1, WARN) \
+       FUNC(ZERO_PADDED_FILEMODE, WARN) \
+       FUNC(NUL_IN_COMMIT, WARN) \
+       /* infos (reported as warnings, but ignored by default) */ \
+       FUNC(GITMODULES_PARSE, INFO) \
+       FUNC(BAD_TAG_NAME, INFO) \
+       FUNC(MISSING_TAGGER_ENTRY, INFO) \
+       /* ignored (elevated when requested) */ \
+       FUNC(EXTRA_HEADER_ENTRY, IGNORE)
+
+#define MSG_ID(id, msg_type) FSCK_MSG_##id,
+enum fsck_msg_id {
+       FOREACH_FSCK_MSG_ID(MSG_ID)
+       FSCK_MSG_MAX
+};
+#undef MSG_ID
+
 struct fsck_options;
 struct object;