fsck: give the error function a chance to see the fsck_options

We will need this in the next commit, where fsck will be taught to
optionally name the objects when reporting issues about them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 87df191e49171ef2a47cfc173b8f876905396796..6c9d59885309fc252c5f454a5586c7633adcb603 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -82,7 +82,8 @@ static int objerror(struct object *obj, const char *err)
        return -1;
 }
 
        return -1;
 }
 

-static int fsck_error_func(struct object *obj, int type, const char *message)
+static int fsck_error_func(struct fsck_options *o,
+       struct object *obj, int type, const char *message)

 {
        objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message);
        return (type == FSCK_WARN) ? 0 : 1;
 {
        objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message);
        return (type == FSCK_WARN) ? 0 : 1;

diff --git a/fsck.c b/fsck.c
index 6ed90ec15edceb40c7e9ba5c8646d6e36052a4fe..828c5c6484f6c9f9e0b074674295a62da45308c9 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -291,7 +291,7 @@ static int report(struct fsck_options *options, struct object *object,
 
        va_start(ap, fmt);
        strbuf_vaddf(&sb, fmt, ap);
 
        va_start(ap, fmt);
        strbuf_vaddf(&sb, fmt, ap);

-       result = options->error_func(object, msg_type, sb.buf);
+       result = options->error_func(options, object, msg_type, sb.buf);

        strbuf_release(&sb);
        va_end(ap);
 
        strbuf_release(&sb);
        va_end(ap);
 


@@ -897,7 +897,8 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
                          obj->type);
 }
 
                          obj->type);
 }
 

-int fsck_error_function(struct object *obj, int msg_type, const char *message)
+int fsck_error_function(struct fsck_options *o,
+       struct object *obj, int msg_type, const char *message)

 {
        if (msg_type == FSCK_WARN) {
                warning("object %s: %s", oid_to_hex(&obj->oid), message);
 {
        if (msg_type == FSCK_WARN) {
                warning("object %s: %s", oid_to_hex(&obj->oid), message);

diff --git a/fsck.h b/fsck.h
index 26c0d41eabb521e6a43dd7d5fa98e924dceea99c..1891c1863be85c0607a86023e3da3d39d0dae22c 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -23,9 +23,11 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
 typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */

-typedef int (*fsck_error)(struct object *obj, int type, const char *message);
+typedef int (*fsck_error)(struct fsck_options *o,
+       struct object *obj, int type, const char *message);

 
 

-int fsck_error_function(struct object *obj, int type, const char *message);
+int fsck_error_function(struct fsck_options *o,
+       struct object *obj, int type, const char *message);

 
 struct fsck_options {
        fsck_walk_func walk;
 
 struct fsck_options {
        fsck_walk_func walk;