undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use "sentinel" function attribute for variadic lists

Browse Source 
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>
This commit is contained in:
Jeff King 2013-07-09 20:19:12 -04:00 committed by Junio C Hamano
parent 4621085b7e
commit eccb614924
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
argv-array.h
View File

@ -15,6 +15,7 @@ void argv_array_init(struct argv_array *);
void argv_array_push(struct argv_array *, const char *); void argv_array_push(struct argv_array *, const char *);
__attribute__((format (printf,2,3))) __attribute__((format (printf,2,3)))
void argv_array_pushf(struct argv_array *, const char *fmt, ...); void argv_array_pushf(struct argv_array *, const char *fmt, ...);
__attribute__((sentinel))
void argv_array_pushl(struct argv_array *, ...); void argv_array_pushl(struct argv_array *, ...);
void argv_array_pop(struct argv_array *); void argv_array_pop(struct argv_array *);
void argv_array_clear(struct argv_array *); void argv_array_clear(struct argv_array *);

2
builtin/revert.c
View File

@ -54,6 +54,7 @@ static int option_parse_x(const struct option *opt,
return 0; return 0;
} }
__attribute__((sentinel))
static void verify_opt_compatible(const char *me, const char *base_opt, ...) static void verify_opt_compatible(const char *me, const char *base_opt, ...)
{ {
const char *this_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); die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
} }
__attribute__((sentinel))
static void verify_opt_mutually_compatible(const char *me, ...) static void verify_opt_mutually_compatible(const char *me, ...)
{ {
const char *opt1, *opt2 = NULL; const char *opt1, *opt2 = NULL;

1
exec_cmd.h
View File

@ -7,6 +7,7 @@ extern const char *git_exec_path(void);
extern void setup_path(void); extern void setup_path(void);
extern const char **prepare_git_cmd(const char **argv); extern const char **prepare_git_cmd(const char **argv);
extern int execv_git_cmd(const char **argv); /* NULL terminated */ extern int execv_git_cmd(const char **argv); /* NULL terminated */
__attribute__((sentinel))
extern int execl_git_cmd(const char *cmd, ...); extern int execl_git_cmd(const char *cmd, ...);
extern const char *system_path(const char *path); extern const char *system_path(const char *path);

1
run-command.h
View File

@ -46,6 +46,7 @@ int finish_command(struct child_process *);
int run_command(struct child_process *); int run_command(struct child_process *);
extern char *find_hook(const char *name); extern char *find_hook(const char *name);
__attribute__((sentinel))
extern int run_hook(const char *index_file, const char *name, ...); extern int run_hook(const char *index_file, const char *name, ...);
#define RUN_COMMAND_NO_STDIN 1 #define RUN_COMMAND_NO_STDIN 1