summaryrefslogtreecommitdiff
path: root/builtin/revert.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-07-10 00:19:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-10 05:23:09 (GMT)
commiteccb614924c9067eeceffa503e4da3683f1c8b6b (patch)
tree153f2b480f11456aa7678052a02fd975a89218c7 /builtin/revert.c
parent4621085b7eb2f4cffe16d508988ff9b4a874b4ef (diff)
downloadgit-eccb614924c9067eeceffa503e4da3683f1c8b6b.zip
git-eccb614924c9067eeceffa503e4da3683f1c8b6b.tar.gz
git-eccb614924c9067eeceffa503e4da3683f1c8b6b.tar.bz2
use "sentinel" function attribute for variadic lists
This attribute can help gcc notice when callers forget to add a NULL sentinel to the end of the function. This is our first use of the sentinel attribute, but we shouldn't need to #ifdef for other compilers, as __attribute__ is already a no-op on non-gcc-compatible compilers. Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com> More-Spots-Found-By: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/revert.c')
-rw-r--r--builtin/revert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 0401fdb..b8b5174 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -54,6 +54,7 @@ static int option_parse_x(const struct option *opt,
return 0;
}
+__attribute__((sentinel))
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);
}
+__attribute__((sentinel))
static void verify_opt_mutually_compatible(const char *me, ...)
{
const char *opt1, *opt2 = NULL;