From 22410549fc71b3973a61666f82b7c76317da5df0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 22 Jun 2015 17:25:00 +0200 Subject: fsck: introduce fsck options Just like the diff machinery, we are about to introduce more settings, therefore it makes sense to carry them around as a (pointer to a) struct containing all of them. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- fsck.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'fsck.h') diff --git a/fsck.h b/fsck.h index d1e6387a44..07d0ab2fab 100644 --- a/fsck.h +++ b/fsck.h @@ -4,6 +4,8 @@ #define FSCK_ERROR 1 #define FSCK_WARN 2 +struct fsck_options; + /* * callback function for fsck_walk * type is the expected type of the object or OBJ_ANY @@ -12,7 +14,7 @@ * <0 error signaled and abort * >0 error signaled and do not abort */ -typedef int (*fsck_walk_func)(struct object *obj, int type, void *data); +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 *err, ...); @@ -20,6 +22,15 @@ typedef int (*fsck_error)(struct object *obj, int type, const char *err, ...); __attribute__((format (printf, 3, 4))) int fsck_error_function(struct object *obj, int type, const char *fmt, ...); +struct fsck_options { + fsck_walk_func walk; + fsck_error error_func; + unsigned strict:1; +}; + +#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0 } +#define FSCK_OPTIONS_STRICT { NULL, fsck_error_function, 1 } + /* descend in all linked child objects * the return value is: * -1 error in processing the object @@ -27,9 +38,9 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...); * >0 return value of the first signaled error >0 (in the case of no other errors) * 0 everything OK */ -int fsck_walk(struct object *obj, fsck_walk_func walk, void *data); +int fsck_walk(struct object *obj, void *data, struct fsck_options *options); /* If NULL is passed for data, we assume the object is local and read it. */ int fsck_object(struct object *obj, void *data, unsigned long size, - int strict, fsck_error error_func); + struct fsck_options *options); #endif -- cgit v1.2.3