diff options
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/am.c | 2 | ||||
-rw-r--r-- | builtin/bisect--helper.c | 12 | ||||
-rw-r--r-- | builtin/checkout.c | 4 | ||||
-rw-r--r-- | builtin/commit-graph.c | 2 | ||||
-rw-r--r-- | builtin/config.c | 6 | ||||
-rw-r--r-- | builtin/describe.c | 4 | ||||
-rw-r--r-- | builtin/difftool.c | 10 | ||||
-rw-r--r-- | builtin/fast-export.c | 2 | ||||
-rw-r--r-- | builtin/fast-import.c | 2 | ||||
-rw-r--r-- | builtin/fetch.c | 8 | ||||
-rw-r--r-- | builtin/fsck.c | 12 | ||||
-rw-r--r-- | builtin/gc.c | 4 | ||||
-rw-r--r-- | builtin/log.c | 4 | ||||
-rw-r--r-- | builtin/ls-tree.c | 10 | ||||
-rw-r--r-- | builtin/multi-pack-index.c | 2 | ||||
-rw-r--r-- | builtin/name-rev.c | 2 | ||||
-rw-r--r-- | builtin/pack-objects.c | 12 | ||||
-rw-r--r-- | builtin/receive-pack.c | 4 | ||||
-rw-r--r-- | builtin/reflog.c | 4 | ||||
-rw-r--r-- | builtin/remote.c | 14 | ||||
-rw-r--r-- | builtin/repack.c | 4 | ||||
-rw-r--r-- | builtin/rev-parse.c | 4 | ||||
-rw-r--r-- | builtin/show-branch.c | 6 | ||||
-rw-r--r-- | builtin/show-ref.c | 6 | ||||
-rw-r--r-- | builtin/stash.c | 12 | ||||
-rw-r--r-- | builtin/submodule--helper.c | 4 |
26 files changed, 78 insertions, 78 deletions
diff --git a/builtin/am.c b/builtin/am.c index 0811b9ff67..39fea24833 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2301,7 +2301,7 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar return 0; } -static int git_am_config(const char *k, const char *v, void *UNUSED(cb)) +static int git_am_config(const char *k, const char *v, void *cb UNUSED) { int status; diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 87c8b2d818..aa975bd926 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -329,9 +329,9 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd) return 0; } -static int inc_nr(const char *UNUSED(refname), - const struct object_id *UNUSED(oid), - int UNUSED(flag), void *cb_data) +static int inc_nr(const char *refname UNUSED, + const struct object_id *oid UNUSED, + int flag UNUSED, void *cb_data) { unsigned int *nr = (unsigned int *)cb_data; (*nr)++; @@ -519,7 +519,7 @@ finish: } static int add_bisect_ref(const char *refname, const struct object_id *oid, - int UNUSED(flags), void *cb) + int flags UNUSED, void *cb) { struct add_bisect_ref_data *data = cb; @@ -1135,9 +1135,9 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a return res; } -static int get_first_good(const char *UNUSED(refname), +static int get_first_good(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flag), void *cb_data) + int flag UNUSED, void *cb_data) { oidcpy(cb_data, oid); return 1; diff --git a/builtin/checkout.c b/builtin/checkout.c index d18c8c886e..2a132392fb 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -125,7 +125,7 @@ static int post_checkout_hook(struct commit *old_commit, struct commit *new_comm } static int update_some(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *UNUSED(context)) + const char *pathname, unsigned mode, void *context UNUSED) { int len; struct cache_entry *ce; @@ -990,7 +990,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts, static int add_pending_uninteresting_ref(const char *refname, const struct object_id *oid, - int UNUSED(flags), void *cb_data) + int flags UNUSED, void *cb_data) { add_pending_oid(cb_data, refname, oid, UNINTERESTING); return 0; diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index ea923ea33a..aaa1b5b960 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -179,7 +179,7 @@ static int write_option_max_new_filters(const struct option *opt, } static int git_commit_graph_write_config(const char *var, const char *value, - void *UNUSED(cb)) + void *cb UNUSED) { if (!strcmp(var, "commitgraph.maxnewfilters")) write_opts.max_new_filters = git_config_int(var, value); diff --git a/builtin/config.c b/builtin/config.c index bdc8b1d1a8..753e5fac29 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -208,7 +208,7 @@ static void show_config_scope(struct strbuf *buf) } static int show_all_config(const char *key_, const char *value_, - void *UNUSED(cb)) + void *cb UNUSED) { if (show_origin || show_scope) { struct strbuf buf = STRBUF_INIT; @@ -460,7 +460,7 @@ static const char *get_colorbool_slot; static char parsed_color[COLOR_MAXLEN]; static int git_get_color_config(const char *var, const char *value, - void *UNUSED(cb)) + void *cb UNUSED) { if (!strcmp(var, get_color_slot)) { if (!value) @@ -492,7 +492,7 @@ static int get_colorbool_found; static int get_diff_color_found; static int get_color_ui_found; static int git_get_colorbool_config(const char *var, const char *value, - void *UNUSED(data)) + void *data UNUSED) { if (!strcmp(var, get_colorbool_slot)) get_colorbool_found = git_config_colorbool(var, value); diff --git a/builtin/describe.c b/builtin/describe.c index 084fa00f2a..e17c4b4c69 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -63,7 +63,7 @@ static const char *prio_names[] = { N_("head"), N_("lightweight"), N_("annotated"), }; -static int commit_name_neq(const void *UNUSED(cmp_data), +static int commit_name_neq(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *peeled) @@ -141,7 +141,7 @@ static void add_to_known_names(const char *path, } static int get_name(const char *path, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { int is_tag = 0; struct object_id peeled; diff --git a/builtin/difftool.c b/builtin/difftool.c index a570200e66..f780ebfd55 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -125,10 +125,10 @@ struct working_tree_entry { char path[FLEX_ARRAY]; }; -static int working_tree_entry_cmp(const void *UNUSED(cmp_data), +static int working_tree_entry_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *UNUSED(keydata)) + const void *keydata UNUSED) { const struct working_tree_entry *a, *b; @@ -148,10 +148,10 @@ struct pair_entry { const char path[FLEX_ARRAY]; }; -static int pair_cmp(const void *UNUSED(cmp_data), +static int pair_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *UNUSED(keydata)) + const void *keydata UNUSED) { const struct pair_entry *a, *b; @@ -184,7 +184,7 @@ struct path_entry { char path[FLEX_ARRAY]; }; -static int path_entry_cmp(const void *UNUSED(cmp_data), +static int path_entry_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *key) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index bb05b50a5a..ab5b0ff610 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -119,7 +119,7 @@ struct anonymized_entry_key { size_t orig_len; }; -static int anonymized_entry_cmp(const void *UNUSED(cmp_data), +static int anonymized_entry_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *keydata) diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 76ed0c2db9..7134683ab9 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -46,7 +46,7 @@ struct object_entry { depth : DEPTH_BITS; }; -static int object_entry_hashcmp(const void *UNUSED(map_data), +static int object_entry_hashcmp(const void *map_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *keydata) diff --git a/builtin/fetch.c b/builtin/fetch.c index 5fddaef480..7f5b0f4c2a 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -301,7 +301,7 @@ struct refname_hash_entry { char refname[FLEX_ARRAY]; }; -static int refname_hash_entry_cmp(const void *UNUSED(hashmap_cmp_fn_data), +static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *keydata) @@ -329,7 +329,7 @@ static struct refname_hash_entry *refname_hash_add(struct hashmap *map, static int add_one_refname(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *cbdata) + int flag UNUSED, void *cbdata) { struct hashmap *refname_map = cbdata; @@ -1462,9 +1462,9 @@ static void set_option(struct transport *transport, const char *name, const char } -static int add_oid(const char *UNUSED(refname), +static int add_oid(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flags), void *cb_data) + int flags UNUSED, void *cb_data) { struct oid_array *oids = cb_data; diff --git a/builtin/fsck.c b/builtin/fsck.c index 31d3da8954..f7916f06ed 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -488,9 +488,9 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, } static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), - timestamp_t timestamp, int UNUSED(tz), - const char *UNUSED(message), void *cb_data) + const char *email UNUSED, + timestamp_t timestamp, int tz UNUSED, + const char *message UNUSED, void *cb_data) { const char *refname = cb_data; @@ -504,8 +504,8 @@ static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid } static int fsck_handle_reflog(const char *logname, - const struct object_id *UNUSED(oid), - int UNUSED(flag), void *cb_data) + const struct object_id *oid UNUSED, + int flag UNUSED, void *cb_data) { struct strbuf refname = STRBUF_INIT; @@ -516,7 +516,7 @@ static int fsck_handle_reflog(const char *logname, } static int fsck_handle_ref(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { struct object *obj; diff --git a/builtin/gc.c b/builtin/gc.c index e4ede128c9..2d09321185 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -782,9 +782,9 @@ struct cg_auto_data { int limit; }; -static int dfs_on_ref(const char *UNUSED(refname), +static int dfs_on_ref(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flags), + int flags UNUSED, void *cb_data) { struct cg_auto_data *data = (struct cg_auto_data *)cb_data; diff --git a/builtin/log.c b/builtin/log.c index 79a2e4d0bb..3f9a6e8cf2 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -645,8 +645,8 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev) return 0; } -static int show_tree_object(const struct object_id *UNUSED(oid), - struct strbuf *UNUSED(base), +static int show_tree_object(const struct object_id *oid UNUSED, + struct strbuf *base UNUSED, const char *pathname, unsigned mode, void *context) { diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 48df337605..c3ea09281a 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -142,7 +142,7 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname } static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *UNUSED(context)) + const char *pathname, unsigned mode, void *context UNUSED) { size_t baselen; int recurse = 0; @@ -213,7 +213,7 @@ static void show_tree_common_default_long(struct strbuf *base, static int show_tree_default(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; @@ -231,7 +231,7 @@ static int show_tree_default(const struct object_id *oid, struct strbuf *base, static int show_tree_long(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; @@ -261,7 +261,7 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base, static int show_tree_name_only(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; @@ -282,7 +282,7 @@ static int show_tree_name_only(const struct object_id *oid, struct strbuf *base, static int show_tree_object(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 8d156766af..b3a3f0a571 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -78,7 +78,7 @@ static struct option *add_common_options(struct option *prev) } static int git_multi_pack_index_write_config(const char *var, const char *value, - void *UNUSED(cb)) + void *cb UNUSED) { if (!strcmp(var, "pack.writebitmaphashcache")) { if (git_config_bool(var, value)) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index c4dc143c4b..15535e914a 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -345,7 +345,7 @@ static int cmp_by_tag_and_age(const void *a_, const void *b_) } static int name_ref(const char *path, const struct object_id *oid, - int UNUSED(flags), void *cb_data) + int flags UNUSED, void *cb_data) { struct object *o = parse_object(the_repository, oid); struct name_ref_data *data = cb_data; diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index eb93e5c8fe..8fd2794a32 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -759,8 +759,8 @@ static enum write_one_status write_one(struct hashfile *f, return WRITE_ONE_WRITTEN; } -static int mark_tagged(const char *UNUSED(path), const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) +static int mark_tagged(const char *path UNUSED, const struct object_id *oid, + int flag UNUSED, void *cb_data UNUSED) { struct object_id peeled; struct object_entry *entry = packlist_find(&to_pack, oid); @@ -3035,8 +3035,8 @@ static void add_tag_chain(const struct object_id *oid) } } -static int add_ref_tag(const char *UNUSED(tag), const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) +static int add_ref_tag(const char *tag UNUSED, const struct object_id *oid, + int flag UNUSED, void *cb_data UNUSED) { struct object_id peeled; @@ -3952,8 +3952,8 @@ static void record_recent_commit(struct commit *commit, void *data) static int mark_bitmap_preferred_tip(const char *refname, const struct object_id *oid, - int UNUSED(flags), - void *UNUSED(data)) + int flags UNUSED, + void *data UNUSED) { struct object_id peeled; struct object *object; diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 6882d526e6..44bcea3a5b 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -291,7 +291,7 @@ static void show_ref(const char *path, const struct object_id *oid) } static int show_ref_cb(const char *path_full, const struct object_id *oid, - int UNUSED(flag), void *data) + int flag UNUSED, void *data) { struct oidset *seen = data; const char *path = strip_namespace(path_full); @@ -465,7 +465,7 @@ static void rp_error(const char *err, ...) va_end(params); } -static int copy_to_sideband(int in, int UNUSED(out), void *UNUSED(arg)) +static int copy_to_sideband(int in, int out UNUSED, void *arg UNUSED) { char data[128]; int keepalive_active = 0; diff --git a/builtin/reflog.c b/builtin/reflog.c index 63f9a23357..8f2da0b65b 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -56,8 +56,8 @@ struct worktree_reflogs { struct string_list reflogs; }; -static int collect_reflog(const char *ref, const struct object_id *UNUSED(oid), - int UNUSED(flags), void *cb_data) +static int collect_reflog(const char *ref, const struct object_id *oid UNUSED, + int flags UNUSED, void *cb_data) { struct worktree_reflogs *cb = cb_data; struct worktree *worktree = cb->worktree; diff --git a/builtin/remote.c b/builtin/remote.c index 87dda7c37b..24cd809d24 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -265,7 +265,7 @@ static const char *abbrev_ref(const char *name, const char *prefix) #define abbrev_branch(name) abbrev_ref((name), "refs/heads/") static int config_read_branches(const char *key, const char *value, - void *UNUSED(data)) + void *data UNUSED) { const char *orig_key = key; char *name; @@ -539,8 +539,8 @@ struct branches_for_remote { }; static int add_branch_for_removal(const char *refname, - const struct object_id *UNUSED(oid), - int UNUSED(flags), void *cb_data) + const struct object_id *oid UNUSED, + int flags UNUSED, void *cb_data) { struct branches_for_remote *branches = cb_data; struct refspec_item refspec; @@ -582,8 +582,8 @@ struct rename_info { }; static int read_remote_branches(const char *refname, - const struct object_id *UNUSED(oid), - int UNUSED(flags), void *cb_data) + const struct object_id *oid UNUSED, + int flags UNUSED, void *cb_data) { struct rename_info *rename = cb_data; struct strbuf buf = STRBUF_INIT; @@ -956,7 +956,7 @@ static void free_remote_ref_states(struct ref_states *states) } static int append_ref_to_tracked_list(const char *refname, - const struct object_id *UNUSED(oid), + const struct object_id *oid UNUSED, int flags, void *cb_data) { struct ref_states *states = cb_data; @@ -1486,7 +1486,7 @@ static int prune(int argc, const char **argv) return result; } -static int get_remote_default(const char *key, const char *UNUSED(value), void *priv) +static int get_remote_default(const char *key, const char *value UNUSED, void *priv) { if (strcmp(key, "remotes.default") == 0) { int *found = priv; diff --git a/builtin/repack.c b/builtin/repack.c index ff952dec48..a5bacc7797 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -514,9 +514,9 @@ struct midx_snapshot_ref_data { int preferred; }; -static int midx_snapshot_ref_one(const char *UNUSED(refname), +static int midx_snapshot_ref_one(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flag), void *_data) + int flag UNUSED, void *_data) { struct midx_snapshot_ref_data *data = _data; struct object_id peeled; diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 3c448d438b..e5d70ee6d2 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -196,7 +196,7 @@ static int show_default(void) } static int show_reference(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { if (ref_excluded(ref_excludes, refname)) return 0; @@ -205,7 +205,7 @@ static int show_reference(const char *refname, const struct object_id *oid, } static int anti_reference(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { show_rev(REVERSED, oid, refname); return 0; diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 3ec011bea4..d3f5715e3e 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -404,7 +404,7 @@ static int append_ref(const char *refname, const struct object_id *oid, } static int append_head_ref(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { struct object_id tmp; int ofs = 11; @@ -419,7 +419,7 @@ static int append_head_ref(const char *refname, const struct object_id *oid, } static int append_remote_ref(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { struct object_id tmp; int ofs = 13; @@ -434,7 +434,7 @@ static int append_remote_ref(const char *refname, const struct object_id *oid, } static int append_tag_ref(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cb_data)) + int flag UNUSED, void *cb_data UNUSED) { if (!starts_with(refname, "refs/tags/")) return 0; diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 9746537220..4856906108 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -47,7 +47,7 @@ static void show_one(const char *refname, const struct object_id *oid) } static int show_ref(const char *refname, const struct object_id *oid, - int UNUSED(flag), void *UNUSED(cbdata)) + int flag UNUSED, void *cbdata UNUSED) { if (show_head && !strcmp(refname, "HEAD")) goto match; @@ -78,8 +78,8 @@ match: } static int add_existing(const char *refname, - const struct object_id *UNUSED(oid), - int UNUSED(flag), void *cbdata) + const struct object_id *oid UNUSED, + int flag UNUSED, void *cbdata) { struct string_list *list = (struct string_list *)cbdata; string_list_insert(list, refname); diff --git a/builtin/stash.c b/builtin/stash.c index a741b920b3..3492aff751 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -638,12 +638,12 @@ cleanup: return ret; } -static int reject_reflog_ent(struct object_id *UNUSED(ooid), - struct object_id *UNUSED(noid), - const char *UNUSED(email), - timestamp_t UNUSED(timestamp), - int UNUSED(tz), const char *UNUSED(message), - void *UNUSED(cb_data)) +static int reject_reflog_ent(struct object_id *ooid UNUSED, + struct object_id *noid UNUSED, + const char *email UNUSED, + timestamp_t timestamp UNUSED, + int tz UNUSED, const char *message UNUSED, + void *cb_data UNUSED) { return 1; } diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index e24e721458..88df6c5017 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -622,9 +622,9 @@ static void print_status(unsigned int flags, char state, const char *path, printf("\n"); } -static int handle_submodule_head_ref(const char *UNUSED(refname), +static int handle_submodule_head_ref(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flags), + int flags UNUSED, void *cb_data) { struct object_id *output = cb_data; |