Add the LAST_ARG_MUST_BE_NULL macro
The sentinel function attribute is not understood by versions of the gcc compiler prior to v4.0. At present, for earlier versions of gcc, the build issues 108 warnings related to the unknown attribute. In order to suppress the warnings, we conditionally define the LAST_ARG_MUST_BE_NULL macro to provide the sentinel attribute for gcc v4.0 and newer. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Jul 18, 2013 at 21:02 UTC
9fe3edc47f1f17a53272671c572c90ba71eb4f74
5 files changed
+12
-5
argv-array.h
+1
-1
@@ -15,7 +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))
18
+LAST_ARG_MUST_BE_NULL
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
-2
@@ -54,7 +54,7 @@ static int option_parse_x(const struct option *opt,
54
return 0;
55
}
56
57
-__attribute__((sentinel))
57
+LAST_ARG_MUST_BE_NULL
58
static void verify_opt_compatible(const char *me, const char *base_opt, ...)
59
{
60
const char *this_opt;
@@ -71,7 +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))
74
+LAST_ARG_MUST_BE_NULL
75
static void verify_opt_mutually_compatible(const char *me, ...)
76
{
77
const char *opt1, *opt2 = NULL;
exec_cmd.h
+1
-1
@@ -7,7 +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))
10
+LAST_ARG_MUST_BE_NULL
11
extern int execl_git_cmd(const char *cmd, ...);
12
extern const char *system_path(const char *path);
13
git-compat-util.h
+7
@@ -295,6 +295,13 @@ extern char *gitbasename(char *);
295
#endif
296
#endif
297
298
+/* The sentinel attribute is valid from gcc version 4.0 */
299
+#if defined(__GNUC__) && (__GNUC__ >= 4)
300
+#define LAST_ARG_MUST_BE_NULL __attribute__((sentinel))
301
+#else
302
+#define LAST_ARG_MUST_BE_NULL
303
+#endif
304
+
305
#include "compat/bswap.h"
306
307
#ifdef USE_WILDMATCH
run-command.h
+1
-1
@@ -46,7 +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))
49
+LAST_ARG_MUST_BE_NULL
50
extern int run_hook(const char *index_file, const char *name, ...);
51
52
#define RUN_COMMAND_NO_STDIN 1