Skip to content

Commit 1ee3471

Browse files
peffgitster
authored andcommitted
string-list: mark unused callback parameters
String-lists may be used with callbacks for clearing or iteration. These callbacks need to conform to a particular interface, even though not every callback needs all of its parameters. Mark the unused ones to make -Wunused-parameter happy. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9eb6cda commit 1ee3471

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

archive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ static void parse_treeish_arg(const char **argv,
500500
ar_args->time = archive_time;
501501
}
502502

503-
static void extra_file_info_clear(void *util, const char *str)
503+
static void extra_file_info_clear(void *util, const char *str UNUSED)
504504
{
505505
struct extra_file_info *info = util;
506506
free(info->base);

builtin/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ static uint64_t estimate_repack_memory(struct packed_git *pack)
329329
return os_cache + heap;
330330
}
331331

332-
static int keep_one_pack(struct string_list_item *item, void *data)
332+
static int keep_one_pack(struct string_list_item *item, void *data UNUSED)
333333
{
334334
strvec_pushf(&repack, "--keep-pack=%s", basename(item->string));
335335
return 0;

builtin/remote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ static int rm(int argc, const char **argv, const char *prefix)
940940
return result;
941941
}
942942

943-
static void clear_push_info(void *util, const char *string)
943+
static void clear_push_info(void *util, const char *string UNUSED)
944944
{
945945
struct push_info *info = util;
946946
free(info->dest);

merge-ort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ struct conflicted_submodule_item {
397397
int flag;
398398
};
399399

400-
static void conflicted_submodule_item_free(void *util, const char *str)
400+
static void conflicted_submodule_item_free(void *util, const char *str UNUSED)
401401
{
402402
struct conflicted_submodule_item *item = util;
403403

reflog-walk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static void free_complete_reflog(struct complete_reflogs *array)
5555
free(array);
5656
}
5757

58-
static void complete_reflogs_clear(void *util, const char *str)
58+
static void complete_reflogs_clear(void *util, const char *str UNUSED)
5959
{
6060
struct complete_reflogs *array = util;
6161
free_complete_reflog(array);

string-list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void filter_string_list(struct string_list *list, int free_util,
156156
list->nr = dst;
157157
}
158158

159-
static int item_is_not_empty(struct string_list_item *item, void *unused)
159+
static int item_is_not_empty(struct string_list_item *item, void *data UNUSED)
160160
{
161161
return *item->string != '\0';
162162
}

t/helper/test-path-utils.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
* GIT_CEILING_DIRECTORIES. If the path is unusable for some reason,
99
* die with an explanation.
1010
*/
11-
static int normalize_ceiling_entry(struct string_list_item *item, void *unused)
11+
static int normalize_ceiling_entry(struct string_list_item *item,
12+
void *data UNUSED)
1213
{
1314
char *ceil = item->string;
1415

0 commit comments

Comments
 (0)