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>
Jeff King committed
Jul 9, 2013 at 20:19 UTC
eccb614924c9067eeceffa503e4da3683f1c8b6b
4 files changed
+5
argv-array.h
+1
@@ -15,6 +15,7 @@ void argv_array_init(struct argv_array *);
15
void argv_array_push(struct argv_array *, const char *);
16
__attribute__((format (printf,2,3)))
17
void argv_array_pushf(struct argv_array *, const char *fmt, ...);
18
+__attribute__((sentinel))
19
void argv_array_pushl(struct argv_array *, ...);
20
void argv_array_pop(struct argv_array *);
21
void argv_array_clear(struct argv_array *);
builtin/revert.c
+2
@@ -54,6 +54,7 @@ static int option_parse_x(const struct option *opt,
54
return 0;
55
}
56
57
+__attribute__((sentinel))
58
static void verify_opt_compatible(const char *me, const char *base_opt, ...)
59
{
60
const char *this_opt;
@@ -70,6 +71,7 @@ static void verify_opt_compatible(const char *me, const char *base_opt, ...)
71
die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
72
}
73
74
+__attribute__((sentinel))
75
static void verify_opt_mutually_compatible(const char *me, ...)
76
{
77
const char *opt1, *opt2 = NULL;
exec_cmd.h
+1
@@ -7,6 +7,7 @@ extern const char *git_exec_path(void);
7
extern void setup_path(void);
8
extern const char **prepare_git_cmd(const char **argv);
9
extern int execv_git_cmd(const char **argv); /* NULL terminated */
10
+__attribute__((sentinel))
11
extern int execl_git_cmd(const char *cmd, ...);
12
extern const char *system_path(const char *path);
13
run-command.h
+1
@@ -46,6 +46,7 @@ int finish_command(struct child_process *);
46
int run_command(struct child_process *);
47
48
extern char *find_hook(const char *name);
49
+__attribute__((sentinel))
50
extern int run_hook(const char *index_file, const char *name, ...);
51
52
#define RUN_COMMAND_NO_STDIN 1