summaryrefslogtreecommitdiff
path: root/fsck.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:39:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:39:38 -0700
commit49981d8a250837019b4a14f44d471fc6ff7e334f (patch)
treec3394268eaaade296d7de692fe7e76bacb3be97b /fsck.h
parentPrepare for 2.9.4 (diff)
parentGit 2.10 (diff)
downloadtgif-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz
Start maintenance track for 2.10.x series
Diffstat (limited to 'fsck.h')
-rw-r--r--fsck.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/fsck.h b/fsck.h
index dded84b5f9..1891c1863b 100644
--- 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_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;
@@ -33,6 +35,7 @@ struct fsck_options {
unsigned strict:1;
int *msg_type;
struct sha1_array *skiplist;
+ struct decoration *object_names;
};
#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL }