]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/unused-annotation'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Sep 2022 19:56:38 +0000 (12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Sep 2022 19:56:39 +0000 (12:56 -0700)
Annotate function parameters that are not used (but cannot be
removed for structural reasons), to prepare us to later compile
with -Wunused warning turned on.

* jk/unused-annotation:
  is_path_owned_by_current_uid(): mark "report" parameter as unused
  run-command: mark unused async callback parameters
  mark unused read_tree_recursive() callback parameters
  hashmap: mark unused callback parameters
  config: mark unused callback parameters
  streaming: mark unused virtual method parameters
  transport: mark bundle transport_options as unused
  refs: mark unused virtual method parameters
  refs: mark unused reflog callback parameters
  refs: mark unused each_ref_fn parameters
  git-compat-util: add UNUSED macro

31 files changed:
1  2 
attr.c
builtin/bisect--helper.c
builtin/commit-graph.c
builtin/difftool.c
builtin/fast-export.c
builtin/fetch.c
builtin/gc.c
builtin/log.c
builtin/multi-pack-index.c
builtin/pack-objects.c
builtin/reflog.c
builtin/remote.c
builtin/rev-parse.c
builtin/stash.c
builtin/submodule--helper.c
commit-graph.c
diff.c
dir.c
environment.c
fetch-pack.c
git-compat-util.h
log-tree.c
notes.c
packfile.c
pretty.c
range-diff.c
refs.c
revision.c
sequencer.c
submodule.c
upload-pack.c

diff --cc attr.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/gc.c
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/stash.c
Simple merge
Simple merge
diff --cc commit-graph.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc dir.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc fetch-pack.c
Simple merge
Simple merge
diff --cc log-tree.c
index 3e8c70ddcf441847a900eff8057d013d5a414d62,114bd80365e31b4852effe494e7100c2d2713af8..6b93870279cf335236db7fe243b00b166e0b9bd1
@@@ -135,9 -135,9 +135,10 @@@ static int ref_filter_match(const char 
  }
  
  static int add_ref_decoration(const char *refname, const struct object_id *oid,
-                             int flags, void *cb_data)
+                             int UNUSED(flags),
+                             void *cb_data)
  {
 +      int i;
        struct object *obj;
        enum object_type objtype;
        enum decoration_type deco_type = DECORATION_NONE;
diff --cc notes.c
Simple merge
diff --cc packfile.c
Simple merge
diff --cc pretty.c
Simple merge
diff --cc range-diff.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc submodule.c
Simple merge
diff --cc upload-pack.c
Simple merge