fsck: mark unused parameters in various fsck callbacks
There are a few callback functions which are used with the fsck code, but it's natural that not all callbacks need all parameters. For reporting, even something as obvious as "the oid of the object which had a problem" is not always used, as some callers are only checking a single object in the first place. And for both reporting and walking, things like void data pointers and the fsck_options aren't always necessary. But since each such parameter is used by _some_ callback, we have to keep them in the interface. Mark the unused ones in specific callbacks to avoid triggering -Wunused-parameter. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 3, 2023 at 02:44 UTC
0b4e9013f1f23f0ee0758b2c6abfc446b1376bb0
6 files changed
+20
-18
builtin/fsck.c
+5
-5
@@ -92,11 +92,11 @@ static int objerror(struct object *obj, const char *err)
92
return -1;
93
}
94
95
-static int fsck_error_func(struct fsck_options *o,
95
+static int fsck_error_func(struct fsck_options *o UNUSED,
96
const struct object_id *oid,
97
enum object_type object_type,
98
enum fsck_msg_type msg_type,
99
- enum fsck_msg_id msg_id,
99
+ enum fsck_msg_id msg_id UNUSED,
100
const char *message)
101
{
102
switch (msg_type) {
@@ -121,7 +121,7 @@ static int fsck_error_func(struct fsck_options *o,
121
static struct object_array pending;
122
123
static int mark_object(struct object *obj, enum object_type type,
124
- void *data, struct fsck_options *options)
124
+ void *data, struct fsck_options *options UNUSED)
125
{
126
struct object *parent = data;
127
@@ -206,8 +206,8 @@ static int traverse_reachable(void)
206
return !!result;
207
}
208
209
-static int mark_used(struct object *obj, enum object_type object_type,
210
- void *data, struct fsck_options *options)
209
+static int mark_used(struct object *obj, int type UNUSED,
210
+ void *data UNUSED, struct fsck_options *options UNUSED)
211
{
212
if (!obj)
213
return 1;
builtin/index-pack.c
+2
-1
@@ -223,7 +223,8 @@ static void cleanup_thread(void)
223
}
224
225
static int mark_link(struct object *obj, enum object_type type,
226
- void *data, struct fsck_options *options)
226
+ void *data UNUSED,
227
+ struct fsck_options *options UNUSED)
228
{
229
if (!obj)
230
return -1;
builtin/mktag.c
+4
-4
@@ -18,11 +18,11 @@ static int option_strict = 1;
18
19
static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
20
21
-static int mktag_fsck_error_func(struct fsck_options *o,
22
- const struct object_id *oid,
23
- enum object_type object_type,
21
+static int mktag_fsck_error_func(struct fsck_options *o UNUSED,
22
+ const struct object_id *oid UNUSED,
23
+ enum object_type object_type UNUSED,
24
enum fsck_msg_type msg_type,
25
- enum fsck_msg_id msg_id,
25
+ enum fsck_msg_id msg_id UNUSED,
26
const char *message)
27
{
28
switch (msg_type) {
builtin/unpack-objects.c
+2
-1
@@ -214,7 +214,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
214
* Verify its reachability and validity recursively and write it out.
215
*/
216
static int check_object(struct object *obj, enum object_type type,
217
- void *data, struct fsck_options *options)
217
+ void *data UNUSED,
218
+ struct fsck_options *options UNUSED)
219
{
220
struct obj_buffer *obj_buf;
221
fsck.c
+2
-2
@@ -1310,9 +1310,9 @@ int fsck_buffer(const struct object_id *oid, enum object_type type,
1310
1311
int fsck_error_function(struct fsck_options *o,
1312
const struct object_id *oid,
1313
- enum object_type object_type,
1313
+ enum object_type object_type UNUSED,
1314
enum fsck_msg_type msg_type,
1315
- enum fsck_msg_id msg_id,
1315
+ enum fsck_msg_id msg_id UNUSED,
1316
const char *message)
1317
{
1318
if (msg_type == FSCK_WARN) {
object-file.c
+5
-5
@@ -2308,11 +2308,11 @@ int repo_has_object_file(struct repository *r,
2308
* report the minimal fsck error here, and rely on the caller to
2309
* give more context.
2310
*/
2311
-static int hash_format_check_report(struct fsck_options *opts,
2312
- const struct object_id *oid,
2313
- enum object_type object_type,
2314
- enum fsck_msg_type msg_type,
2315
- enum fsck_msg_id msg_id,
2311
+static int hash_format_check_report(struct fsck_options *opts UNUSED,
2312
+ const struct object_id *oid UNUSED,
2313
+ enum object_type object_type UNUSED,
2314
+ enum fsck_msg_type msg_type UNUSED,
2315
+ enum fsck_msg_id msg_id UNUSED,
2316
const char *message)
2317
{
2318
error(_("object fails fsck: %s"), message);