run_processes_parallel: mark unused callback parameters

Our parallel process API takes several callbacks via function pointers
in the run_process_paralell_opts struct. Not every callback needs every
parameter; let's mark the unused ones to make -Wunused-parameter happy.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch.c b/builtin/fetch.c
index a21ce89312da93e9689215b8bc28b7428852dd87..c6b1845429c466019ca9836dcafc6192ede9c8c9 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1890,7 +1890,8 @@ struct parallel_fetch_state {
        int next, result;
 };
 
-static int fetch_next_remote(struct child_process *cp, struct strbuf *out,
+static int fetch_next_remote(struct child_process *cp,
+                            struct strbuf *out UNUSED,
                             void *cb, void **task_cb)
 {
        struct parallel_fetch_state *state = cb;
@@ -1912,7 +1913,8 @@ static int fetch_next_remote(struct child_process *cp, struct strbuf *out,
        return 1;
 }
 
-static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb)
+static int fetch_failed_to_start(struct strbuf *out UNUSED,
+                                void *cb, void *task_cb)
 {
        struct parallel_fetch_state *state = cb;
        const char *remote = task_cb;

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4c173d8b37adfc72ec840fd88ca27e36f432aef3..ad272a0d931e45b17c413081260704f9513562eb 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2132,9 +2132,9 @@ static int update_clone_get_next_task(struct child_process *child,
        return 0;
 }
 
-static int update_clone_start_failure(struct strbuf *err,
+static int update_clone_start_failure(struct strbuf *err UNUSED,
                                      void *suc_cb,
-                                     void *idx_task_cb)
+                                     void *idx_task_cb UNUSED)
 {
        struct submodule_update_clone *suc = suc_cb;
 

diff --git a/hook.c b/hook.c
index 1a8483186349b00608d40bc3d8702aa39ffb79c8..866ef0408b2ff29acf4aced9ef32635c0bc665d8 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -43,9 +43,9 @@ int hook_exists(const char *name)
 }
 
 static int pick_next_hook(struct child_process *cp,
-                         struct strbuf *out,
+                         struct strbuf *out UNUSED,
                          void *pp_cb,
-                         void **pp_task_cb)
+                         void **pp_task_cb UNUSED)
 {
        struct hook_cb_data *hook_cb = pp_cb;
        const char *hook_path = hook_cb->hook_path;
@@ -77,9 +77,9 @@ static int pick_next_hook(struct child_process *cp,
        return 1;
 }
 
-static int notify_start_failure(struct strbuf *out,
+static int notify_start_failure(struct strbuf *out UNUSED,
                                void *pp_cb,
-                               void *pp_task_cp)
+                               void *pp_task_cp UNUSED)
 {
        struct hook_cb_data *hook_cb = pp_cb;
 
@@ -89,9 +89,9 @@ static int notify_start_failure(struct strbuf *out,
 }
 
 static int notify_hook_finished(int result,
-                               struct strbuf *out,
+                               struct strbuf *out UNUSED,
                                void *pp_cb,
-                               void *pp_task_cb)
+                               void *pp_task_cb UNUSED)
 {
        struct hook_cb_data *hook_cb = pp_cb;
        struct run_hooks_opt *opt = hook_cb->options;

diff --git a/submodule.c b/submodule.c
index 3a0dfc417c05b627a5100f518768a1b32ee22339..a24269db717245b7ca6f95d17cf53266ab408b92 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1739,7 +1739,7 @@ static int get_next_submodule(struct child_process *cp, struct strbuf *err,
        return 0;
 }
 
-static int fetch_start_failure(struct strbuf *err,
+static int fetch_start_failure(struct strbuf *err UNUSED,
                               void *cb, void *task_cb)
 {
        struct submodule_parallel_fetch *spf = cb;
@@ -1760,7 +1760,7 @@ static int commit_missing_in_sub(const struct object_id *oid, void *data)
        return type != OBJ_COMMIT;
 }
 
-static int fetch_finish(int retvalue, struct strbuf *err,
+static int fetch_finish(int retvalue, struct strbuf *err UNUSED,
                        void *cb, void *task_cb)
 {
        struct submodule_parallel_fetch *spf = cb;

diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 3ecb830f4a8cd196f20ff0c371108c8f5579f3cd..98fa22464087c01ddc3bdc339fb1a58cd3e73d64 100644 (file)
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -24,7 +24,7 @@ static int number_callbacks;
 static int parallel_next(struct child_process *cp,
                         struct strbuf *err,
                         void *cb,
-                        void **task_cb)
+                        void **task_cb UNUSED)
 {
        struct child_process *d = cb;
        if (number_callbacks >= 4)
@@ -40,10 +40,10 @@ static int parallel_next(struct child_process *cp,
        return 1;
 }
 
-static int no_job(struct child_process *cp,
+static int no_job(struct child_process *cp UNUSED,
                  struct strbuf *err,
-                 void *cb,
-                 void **task_cb)
+                 void *cb UNUSED,
+                 void **task_cb UNUSED)
 {
        if (err)
                strbuf_addstr(err, "no further jobs available\n");
@@ -52,10 +52,10 @@ static int no_job(struct child_process *cp,
        return 0;
 }
 
-static int task_finished(int result,
+static int task_finished(int result UNUSED,
                         struct strbuf *err,
-                        void *pp_cb,
-                        void *pp_task_cb)
+                        void *pp_cb UNUSED,
+                        void *pp_task_cb UNUSED)
 {
        if (err)
                strbuf_addstr(err, "asking for a quick stop\n");