use "sentinel" function attribute for variadic lists

peff · gitster · commit eccb614924c9 · 2013-07-09T22:23:09.000-07:00
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 &lt;bert.wesarg@googlemail.com&gt;
More-Spots-Found-By: Matt Kraai &lt;kraai@ftbfs.org&gt;
Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/argv-array.h b/argv-array.h
@@ -15,6 +15,7 @@ void argv_array_init(struct argv_array *);
 void argv_array_push(struct argv_array *, const char *);
 __attribute__((format (printf,2,3)))
 void argv_array_pushf(struct argv_array *, const char *fmt, ...);
+__attribute__((sentinel))
 void argv_array_pushl(struct argv_array *, ...);
 void argv_array_pop(struct argv_array *);
 void argv_array_clear(struct argv_array *);
diff --git 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;
diff --git a/exec_cmd.h b/exec_cmd.h
@@ -7,6 +7,7 @@ extern const char *git_exec_path(void);
 extern void setup_path(void);
 extern const char **prepare_git_cmd(const char **argv);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
+__attribute__((sentinel))
 extern int execl_git_cmd(const char *cmd, ...);
 extern const char *system_path(const char *path);
 
diff --git a/run-command.h b/run-command.h
@@ -46,6 +46,7 @@ int finish_command(struct child_process *);
 int run_command(struct child_process *);
 
 extern char *find_hook(const char *name);
+__attribute__((sentinel))
 extern int run_hook(const char *index_file, const char *name, ...);
 
 #define RUN_COMMAND_NO_STDIN 1

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ static int option_parse_x(const struct option *opt,`
`54`	`54`	`return 0;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+__attribute__((sentinel))`
`57`	`58`	`static void verify_opt_compatible(const char me, const char base_opt, ...)`
`58`	`59`	`{`
`59`	`60`	`const char *this_opt;`
`@@ -70,6 +71,7 @@ static void verify_opt_compatible(const char me, const char base_opt, ...)`
`70`	`71`	`die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);`
`71`	`72`	`}`
`72`	`73`
	`74`	`+__attribute__((sentinel))`
`73`	`75`	`static void verify_opt_mutually_compatible(const char *me, ...)`
`74`	`76`	`{`
`75`	`77`	`const char opt1, opt2 = NULL;`