Browse Source

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>
main
Jeff King 2 years ago committed by Junio C Hamano
parent
commit
a5c76b3698
  1. 6
      builtin/fetch.c
  2. 4
      builtin/submodule--helper.c
  3. 12
      hook.c
  4. 4
      submodule.c
  5. 14
      t/helper/test-run-command.c

6
builtin/fetch.c

@ -1890,7 +1890,8 @@ struct parallel_fetch_state { @@ -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, @@ -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;

4
builtin/submodule--helper.c

@ -2132,9 +2132,9 @@ static int update_clone_get_next_task(struct child_process *child, @@ -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;


12
hook.c

@ -43,9 +43,9 @@ int hook_exists(const char *name) @@ -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, @@ -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, @@ -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;

4
submodule.c

@ -1739,7 +1739,7 @@ static int get_next_submodule(struct child_process *cp, struct strbuf *err, @@ -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) @@ -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;

14
t/helper/test-run-command.c

@ -24,7 +24,7 @@ static int number_callbacks; @@ -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, @@ -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, @@ -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");

Loading…
Cancel
Save