diff options
| -rw-r--r-- | builtin/fsck.c | 10 | ||||
| -rw-r--r-- | builtin/index-pack.c | 3 | ||||
| -rw-r--r-- | builtin/mktag.c | 8 | ||||
| -rw-r--r-- | builtin/unpack-objects.c | 3 | ||||
| -rw-r--r-- | fsck.c | 4 | ||||
| -rw-r--r-- | object-file.c | 10 |
6 files changed, 20 insertions, 18 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 3aa9c812eb..2a494d6197 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -92,11 +92,11 @@ static int objerror(struct object *obj, const char *err) return -1; } -static int fsck_error_func(struct fsck_options *o, +static int fsck_error_func(struct fsck_options *o UNUSED, const struct object_id *oid, enum object_type object_type, enum fsck_msg_type msg_type, - enum fsck_msg_id msg_id, + enum fsck_msg_id msg_id UNUSED, const char *message) { switch (msg_type) { @@ -121,7 +121,7 @@ static int fsck_error_func(struct fsck_options *o, static struct object_array pending; static int mark_object(struct object *obj, enum object_type type, - void *data, struct fsck_options *options) + void *data, struct fsck_options *options UNUSED) { struct object *parent = data; @@ -206,8 +206,8 @@ static int traverse_reachable(void) return !!result; } -static int mark_used(struct object *obj, enum object_type object_type, - void *data, struct fsck_options *options) +static int mark_used(struct object *obj, int type UNUSED, + void *data UNUSED, struct fsck_options *options UNUSED) { if (!obj) return 1; diff --git a/builtin/index-pack.c b/builtin/index-pack.c index e280180cac..3f74364a68 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -223,7 +223,8 @@ static void cleanup_thread(void) } static int mark_link(struct object *obj, enum object_type type, - void *data, struct fsck_options *options) + void *data UNUSED, + struct fsck_options *options UNUSED) { if (!obj) return -1; diff --git a/builtin/mktag.c b/builtin/mktag.c index 43e2766db4..d8e0b5afc0 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -18,11 +18,11 @@ static int option_strict = 1; static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT; -static int mktag_fsck_error_func(struct fsck_options *o, - const struct object_id *oid, - enum object_type object_type, +static int mktag_fsck_error_func(struct fsck_options *o UNUSED, + const struct object_id *oid UNUSED, + enum object_type object_type UNUSED, enum fsck_msg_type msg_type, - enum fsck_msg_id msg_id, + enum fsck_msg_id msg_id UNUSED, const char *message) { switch (msg_type) { diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 1979532a9d..558b8485ba 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -214,7 +214,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf) * Verify its reachability and validity recursively and write it out. */ static int check_object(struct object *obj, enum object_type type, - void *data, struct fsck_options *options) + void *data UNUSED, + struct fsck_options *options UNUSED) { struct obj_buffer *obj_buf; @@ -1310,9 +1310,9 @@ int fsck_buffer(const struct object_id *oid, enum object_type type, int fsck_error_function(struct fsck_options *o, const struct object_id *oid, - enum object_type object_type, + enum object_type object_type UNUSED, enum fsck_msg_type msg_type, - enum fsck_msg_id msg_id, + enum fsck_msg_id msg_id UNUSED, const char *message) { if (msg_type == FSCK_WARN) { diff --git a/object-file.c b/object-file.c index 8d87720dd5..68a2397e33 100644 --- a/object-file.c +++ b/object-file.c @@ -2308,11 +2308,11 @@ int repo_has_object_file(struct repository *r, * report the minimal fsck error here, and rely on the caller to * give more context. */ -static int hash_format_check_report(struct fsck_options *opts, - const struct object_id *oid, - enum object_type object_type, - enum fsck_msg_type msg_type, - enum fsck_msg_id msg_id, +static int hash_format_check_report(struct fsck_options *opts UNUSED, + const struct object_id *oid UNUSED, + enum object_type object_type UNUSED, + enum fsck_msg_type msg_type UNUSED, + enum fsck_msg_id msg_id UNUSED, const char *message) { error(_("object fails fsck: %s"), message); |