grep: prefer UNUSED to MAYBE_UNUSED for pcre allocators
We provide custom malloc/free callbacks for the pcre library to use. Those take an extra "data" parameter, but we don't use it. Back when these were added in 513f2b0bbd (grep: make PCRE2 aware of custom allocator, 2019-10-16), we only had MAYBE_UNUSED. But these days we have UNUSED, which we should prefer, as it will let the compiler inform us if the code changes to actually use the parameters. I also moved the annotations to come after the variable name, which is how we typically spell it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 29, 2024 at 16:09 UTC
516a9ec3d5874aad41757e573f7b841bb45cb098
1 file changed
+2
-2
grep.c
+2
-2
@@ -245,7 +245,7 @@ static int is_fixed(const char *s, size_t len)
245
#ifdef USE_LIBPCRE2
246
#define GREP_PCRE2_DEBUG_MALLOC 0
247
248
-static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
248
+static void *pcre2_malloc(PCRE2_SIZE size, void *memory_data UNUSED)
249
{
250
void *pointer = malloc(size);
251
#if GREP_PCRE2_DEBUG_MALLOC
@@ -255,7 +255,7 @@ static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
255
return pointer;
256
}
257
258
-static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
258
+static void pcre2_free(void *pointer, void *memory_data UNUSED)
259
{
260
#if GREP_PCRE2_DEBUG_MALLOC
261
static int count = 1;