summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 11:23:59 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-22 11:23:59 -0700
commite9f1a6c189c34a7ea98cbdb92acc677a72a5b4ea (patch)
tree54a4008e527cd1094e14cc9914c0cc55ac46a0a6 /builtin
parentd0b3fa8fd9faf5d18d54e2beb04741fff88af358 (diff)
parent9fe3edc47f1f17a53272671c572c90ba71eb4f74 (diff)
downloadgit-e9f1a6c189c34a7ea98cbdb92acc677a72a5b4ea.tar.gz
Merge branch 'jk/gcc-function-attributes'
Use the function attributes extension to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * jk/gcc-function-attributes: Add the LAST_ARG_MUST_BE_NULL macro wt-status: use "format" function attribute for status_printf use "sentinel" function attribute for variadic lists add missing "format" function attributes
Diffstat (limited to 'builtin')
-rw-r--r--builtin/revert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 0401fdb02c..1d2648b756 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -54,6 +54,7 @@ static int option_parse_x(const struct option *opt,
return 0;
}
+LAST_ARG_MUST_BE_NULL
static void verify_opt_compatible(const char *me, const char *base_opt, ...)
{
const char *this_opt;
@@ -70,6 +71,7 @@ static void verify_opt_compatible(const char *me, const char *base_opt, ...)
die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
}
+LAST_ARG_MUST_BE_NULL
static void verify_opt_mutually_compatible(const char *me, ...)
{
const char *opt1, *opt2 = NULL;