Merge branch 'maint'

diff --git a/fsck.h b/fsck.h
index 9bd37c9f1cabb0c9ffb404e1f0f846b5123638e5..990ee02335a2e2693e32baa82b259c23843f2aa0 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -17,6 +17,8 @@ typedef int (*fsck_walk_func)(struct object *obj, int type, void *data);
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct object *obj, int type, const char *err, ...);
 
+int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
+
 /* descend in all linked child objects
  * the return value is:
  *    -1       error in processing the object