Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit eccb614

Browse files
peffgitster
authored andcommitted
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 <[email protected]> More-Spots-Found-By: Matt Kraai <[email protected]> Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4621085 commit eccb614

File tree

4 files changed

+5
-0
lines changed

4 files changed

+5
-0
lines changed

argv-array.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ void argv_array_init(struct argv_array *);
1515
void argv_array_push(struct argv_array *, const char *);
1616
__attribute__((format (printf,2,3)))
1717
void argv_array_pushf(struct argv_array *, const char *fmt, ...);
18+
__attribute__((sentinel))
1819
void argv_array_pushl(struct argv_array *, ...);
1920
void argv_array_pop(struct argv_array *);
2021
void argv_array_clear(struct argv_array *);

builtin/revert.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ static int option_parse_x(const struct option *opt,
5454
return 0;
5555
}
5656

57+
__attribute__((sentinel))
5758
static void verify_opt_compatible(const char *me, const char *base_opt, ...)
5859
{
5960
const char *this_opt;
@@ -70,6 +71,7 @@ static void verify_opt_compatible(const char *me, const char *base_opt, ...)
7071
die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
7172
}
7273

74+
__attribute__((sentinel))
7375
static void verify_opt_mutually_compatible(const char *me, ...)
7476
{
7577
const char *opt1, *opt2 = NULL;

exec_cmd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ extern const char *git_exec_path(void);
77
extern void setup_path(void);
88
extern const char **prepare_git_cmd(const char **argv);
99
extern int execv_git_cmd(const char **argv); /* NULL terminated */
10+
__attribute__((sentinel))
1011
extern int execl_git_cmd(const char *cmd, ...);
1112
extern const char *system_path(const char *path);
1213

run-command.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ int finish_command(struct child_process *);
4646
int run_command(struct child_process *);
4747

4848
extern char *find_hook(const char *name);
49+
__attribute__((sentinel))
4950
extern int run_hook(const char *index_file, const char *name, ...);
5051

5152
#define RUN_COMMAND_NO_STDIN 1

0 commit comments

Comments
 (0)