fsck: add a unified interface for reporting fsck messages

The static function "report" provided by "fsck.c" aims at checking error
type and calling the callback "error_func" to report the message. Both
refs and objects need to check the error type of the current fsck
message. In order to extract this common behavior, create a new function
"fsck_vreport". Instead of using "...", provide "va_list" to allow more
flexibility.

Instead of changing "report" prototype to be align with the
"fsck_vreport" function, we leave the "report" prototype unchanged due
to the reason that there are nearly 62 references about "report"
function. Simply change "report" function to use "fsck_vreport" to
report objects related messages.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: shejialuo <shejialuo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fsck.c b/fsck.c
index cca6ae144f1e23f581f398c22295d7fde9614d45..3614aa56a34f32db439db2cc972161496367e6b5 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -226,16 +226,15 @@ static int object_on_skiplist(struct fsck_options *opts,
        return opts && oid && oidset_contains(&opts->skip_oids, oid);
 }
 
-__attribute__((format (printf, 5, 6)))
-static int report(struct fsck_options *options,
-                 const struct object_id *oid, enum object_type object_type,
-                 enum fsck_msg_id msg_id, const char *fmt, ...)
+/*
+ * Provide the common functionality for either fscking refs or objects.
+ * It will get the current msg error type and call the error_func callback
+ * which is registered in the "fsck_options" struct.
+ */
+static int fsck_vreport(struct fsck_options *options,
+                       void *fsck_report,
+                       enum fsck_msg_id msg_id, const char *fmt, va_list ap)
 {
-       va_list ap;
-       struct fsck_object_report report = {
-               .oid = oid,
-               .object_type = object_type
-       };
        struct strbuf sb = STRBUF_INIT;
        enum fsck_msg_type msg_type = fsck_msg_type(msg_id, options);
        int result;
@@ -243,9 +242,6 @@ static int report(struct fsck_options *options,
        if (msg_type == FSCK_IGNORE)
                return 0;
 
-       if (object_on_skiplist(options, oid))
-               return 0;
-
        if (msg_type == FSCK_FATAL)
                msg_type = FSCK_ERROR;
        else if (msg_type == FSCK_INFO)
@@ -254,11 +250,31 @@ static int report(struct fsck_options *options,
        prepare_msg_ids();
        strbuf_addf(&sb, "%s: ", msg_id_info[msg_id].camelcased);
 
-       va_start(ap, fmt);
        strbuf_vaddf(&sb, fmt, ap);
-       result = options->error_func(options, &report,
+       result = options->error_func(options, fsck_report,
                                     msg_type, msg_id, sb.buf);
        strbuf_release(&sb);
+
+       return result;
+}
+
+__attribute__((format (printf, 5, 6)))
+static int report(struct fsck_options *options,
+                 const struct object_id *oid, enum object_type object_type,
+                 enum fsck_msg_id msg_id, const char *fmt, ...)
+{
+       va_list ap;
+       struct fsck_object_report report = {
+               .oid = oid,
+               .object_type = object_type
+       };
+       int result;
+
+       if (object_on_skiplist(options, oid))
+               return 0;
+
+       va_start(ap, fmt);
+       result = fsck_vreport(options, &report, msg_id, fmt, ap);
        va_end(ap);
 
        return result;