diff mbox series

[09/21] mark "pointless" data pointers in callbacks

Message ID	Y/hbk3/wMqhqTRAF@coredump.intra.peff.net (mailing list archive)
State	Accepted
Commit	d3dcfa047f415de5590b60781dcdf11492e25d41
Headers	show Return-Path: <git-owner@vger.kernel.org> Date: Fri, 24 Feb 2023 01:39:15 -0500 From: Jeff King <peff@peff.net> To: git@vger.kernel.org Subject: [PATCH 09/21] mark "pointless" data pointers in callbacks Message-ID: <Y/hbk3/wMqhqTRAF@coredump.intra.peff.net> References: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net> Precedence: bulk
Series	more -Wunused-parameter fixes \| expand [0/21] more -Wunused-parameter fixes [01/21] ref-filter: drop unused atom parameter from get_worktree_path() [02/21] ls-refs: drop config caching [03/21] serve: use repository pointer to get config [04/21] serve: mark unused parameters in virtual functions [05/21] object-name: mark unused parameters in disambiguate callbacks [06/21] http-backend: mark argc/argv unused [07/21] http-backend: mark unused parameters in virtual functions [08/21] ref-filter: mark unused callback parameters [09/21] mark "pointless" data pointers in callbacks [10/21] run-command: mark error routine parameters as unused [11/21] mark unused parameters in signal handlers [12/21] list-objects: mark unused callback parameters [13/21] for_each_object: mark unused callback parameters [14/21] prio-queue: mark unused parameters in comparison functions [15/21] notes: mark unused callback parameters [16/21] fetch-pack: mark unused parameter in callback function [17/21] rewrite_parents(): mark unused callback parameter [18/21] for_each_commit_graft(): mark unused callback parameter [19/21] userformat_want_item(): mark unused parameter [20/21] run_processes_parallel: mark unused callback parameters [21/21] help: mark unused parameter in git_unknown_cmd_config()

Commit Message

Jeff King Feb. 24, 2023, 6:39 a.m. UTC

Both the object_array_filter() and trie_find() functions use callback
functions that let the caller specify which elements match. These
callbacks take a void pointer in case the caller wants to pass in extra
data. But in each case, the single user of these functions just passes
NULL, and the callback ignores the extra pointer.

We could just remove these unused parameters from the callback interface
entirely. But it's good practice to provide such a pointer, as it guides
future callers of the function in the right direction (rather than
tempting them to access global data). Plus it's consistent with other
generic callback interfaces.

So let's instead annotate the unused parameters, in order to silence the
compiler's -Wunused-parameter warning.

Signed-off-by: Jeff King <peff@peff.net>
---
 path.c     | 3 ++-
 revision.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/path.c b/path.c
index 492e17ad12..0b641233e3 100644
--- a/path.c
+++ b/path.c
@@ -347,7 +347,8 @@  static void init_common_trie(void)
  * Helper function for update_common_dir: returns 1 if the dir
  * prefix is common.
  */
-static int check_common(const char *unmatched, void *value, void *baton)
+static int check_common(const char *unmatched, void *value,
+			void *baton UNUSED)
 {
 	struct common_dir *dir = value;
 
diff --git a/revision.c b/revision.c
index 21f5f572c2..4a24fc3fcd 100644
--- a/revision.c
+++ b/revision.c
@@ -4159,7 +4159,7 @@  static struct commit *get_revision_1(struct rev_info *revs)
  * Return true for entries that have not yet been shown.  (This is an
  * object_array_each_func_t.)
  */
-static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
+static int entry_unshown(struct object_array_entry *entry, void *cb_data UNUSED)
 {
 	return !(entry->item->flags & SHOWN);
 }