aboutsummaryrefslogtreecommitdiffstats
path: root/strbuf.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-14 12:56:39 -0700
committerJunio C Hamano <gitster@pobox.com>2022-09-14 12:56:39 -0700
commitdd407f1c7c7cce148d7313537494d0bc049ccb0e (patch)
tree960438c348acf300fca1f9e795b647df2d6f8e18 /strbuf.c
parenta6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff)
parent9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff)
downloadgit-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.gz
Merge branch 'ab/unused-annotation'
Undoes 'jk/unused-annotation' topic and redoes it to work around Coccinelle rules misfiring false positives in unrelated codepaths. * ab/unused-annotation: git-compat-util.h: use "deprecated" for UNUSED variables git-compat-util.h: use "UNUSED", not "UNUSED(var)"
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strbuf.c b/strbuf.c
index dd9eb85527..0890b1405c 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -436,7 +436,7 @@ void strbuf_expand(struct strbuf *sb, const char *format, expand_fn_t fn,
size_t strbuf_expand_literal_cb(struct strbuf *sb,
const char *placeholder,
- void *context)
+ void *context UNUSED)
{
int ch;