git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 09/21] mark "pointless" data pointers in callbacks
Date: Fri, 24 Feb 2023 01:39:15 -0500	[thread overview]
Message-ID: <Y/hbk3/wMqhqTRAF@coredump.intra.peff.net> (raw)
In-Reply-To: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>

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 --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);
 }
-- 
2.39.2.981.g6157336f25


  parent reply	other threads:[~2023-02-24  6:39 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-24  6:34 [PATCH 0/21] more -Wunused-parameter fixes Jeff King
2023-02-24  6:34 ` [PATCH 01/21] ref-filter: drop unused atom parameter from get_worktree_path() Jeff King
2023-02-24 17:53   ` Junio C Hamano
2023-02-24  6:37 ` [PATCH 02/21] ls-refs: drop config caching Jeff King
2023-02-24  6:38 ` [PATCH 03/21] serve: use repository pointer to get config Jeff King
2023-02-24 17:59   ` Junio C Hamano
2023-02-24  6:38 ` [PATCH 04/21] serve: mark unused parameters in virtual functions Jeff King
2023-02-24  6:38 ` [PATCH 05/21] object-name: mark unused parameters in disambiguate callbacks Jeff King
2023-02-24  6:38 ` [PATCH 06/21] http-backend: mark argc/argv unused Jeff King
2023-02-24  6:38 ` [PATCH 07/21] http-backend: mark unused parameters in virtual functions Jeff King
2023-02-24  6:39 ` [PATCH 08/21] ref-filter: mark unused callback parameters Jeff King
2023-02-24  6:39 ` Jeff King [this message]
2023-02-24  6:39 ` [PATCH 10/21] run-command: mark error routine parameters as unused Jeff King
2023-02-24  6:39 ` [PATCH 11/21] mark unused parameters in signal handlers Jeff King
2023-02-24  6:39 ` [PATCH 12/21] list-objects: mark unused callback parameters Jeff King
2023-02-24  6:39 ` [PATCH 13/21] for_each_object: " Jeff King
2023-02-24  6:39 ` [PATCH 14/21] prio-queue: mark unused parameters in comparison functions Jeff King
2023-02-24  6:39 ` [PATCH 15/21] notes: mark unused callback parameters Jeff King
2023-02-24  6:39 ` [PATCH 16/21] fetch-pack: mark unused parameter in callback function Jeff King
2023-02-24  6:39 ` [PATCH 17/21] rewrite_parents(): mark unused callback parameter Jeff King
2023-02-24  6:39 ` [PATCH 18/21] for_each_commit_graft(): " Jeff King
2023-02-24  6:39 ` [PATCH 19/21] userformat_want_item(): mark unused parameter Jeff King
2023-02-24  6:39 ` [PATCH 20/21] run_processes_parallel: mark unused callback parameters Jeff King
2023-02-24  6:39 ` [PATCH 21/21] help: mark unused parameter in git_unknown_cmd_config() Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y/hbk3/wMqhqTRAF@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).