diff mbox series

[v2,17/22] grep: mark unused parmaeters in pcre fallbacks

Message ID	20230829234534.GO227214@coredump.intra.peff.net (mailing list archive)
State	Accepted
Commit	4548b0145f17c633de5e267b6c7932c72824e9d3
Headers	show Return-Path: <git-owner@vger.kernel.org> Date: Tue, 29 Aug 2023 19:45:34 -0400 From: Jeff King <peff@peff.net> To: git@vger.kernel.org Cc: Taylor Blau <me@ttaylorr.com>, Junio C Hamano <gitster@pobox.com>, Phillip Wood <phillip.wood@dunelm.org.uk> Subject: [PATCH v2 17/22] grep: mark unused parmaeters in pcre fallbacks Message-ID: <20230829234534.GO227214@coredump.intra.peff.net> References: <20230829234305.GA226944@coredump.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230829234305.GA226944@coredump.intra.peff.net> Precedence: bulk
Series	Yet Another Unused Parameter Series \| expand [v2,0/22] Yet Another Unused Parameter Series [v2,01/22] sequencer: use repository parameter in short_commit_name() [v2,02/22] sequencer: mark repository argument as unused [v2,03/22] ref-filter: mark unused parameters in parser callbacks [v2,04/22] pack-bitmap: mark unused parameters in show_object callback [v2,05/22] worktree: mark unused parameters in each_ref_fn callback [v2,06/22] commit-graph: mark unused data parameters in generation callbacks [v2,07/22] ls-tree: mark unused parameter in callback [v2,08/22] stash: mark unused parameter in diff callback [v2,09/22] trace2: mark unused us_elapsed_absolute parameters [v2,10/22] trace2: mark unused config callback parameter [v2,11/22] test-trace2: mark unused argv/argc parameters [v2,12/22] grep: mark unused parameter in output function [v2,13/22] add-interactive: mark unused callback parameters [v2,14/22] negotiator/noop: mark unused callback parameters [v2,15/22] worktree: mark unused parameters in noop repair callback [v2,16/22] imap-send: mark unused parameters with NO_OPENSSL [v2,17/22] grep: mark unused parmaeters in pcre fallbacks [v2,18/22] credential: mark unused parameter in urlmatch callback [v2,19/22] fetch: mark unused parameter in ref_transaction callback [v2,20/22] bundle-uri: mark unused parameters in callbacks [v2,21/22] gc: mark unused descriptors in scheduler callbacks [v2,22/22] update-ref: mark unused parameter in parser callbacks

Commit Message

Jeff King Aug. 29, 2023, 11:45 p.m. UTC

When USE_LIBPCRE2 is not defined, we compile several noop fallbacks.
These need to have their parameters annotated to avoid
-Wunused-parameter warnings (and obviously we cannot remove the
parameters, since the functions must match the non-fallback versions).

Signed-off-by: Jeff King <peff@peff.net>
---
 grep.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/grep.c b/grep.c
index 0124eb1960..fc2d0c837a 100644
--- a/grep.c
+++ b/grep.c
@@ -452,18 +452,20 @@  static void free_pcre2_pattern(struct grep_pat *p)
 	pcre2_general_context_free(p->pcre2_general_context);
 }
 #else /* !USE_LIBPCRE2 */
-static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
+static void compile_pcre2_pattern(struct grep_pat *p UNUSED,
+				  const struct grep_opt *opt UNUSED)
 {
 	die("cannot use Perl-compatible regexes when not compiled with USE_LIBPCRE");
 }
 
-static int pcre2match(struct grep_pat *p, const char *line, const char *eol,
-		regmatch_t *match, int eflags)
+static int pcre2match(struct grep_pat *p UNUSED, const char *line UNUSED,
+		      const char *eol UNUSED, regmatch_t *match UNUSED,
+		      int eflags UNUSED)
 {
 	return 1;
 }
 
-static void free_pcre2_pattern(struct grep_pat *p)
+static void free_pcre2_pattern(struct grep_pat *p UNUSED)
 {
 }