diff options
| author |  Ramsay Jones <ramsay@ramsayjones.plus.com> | 2017-05-21 23:25:39 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-22 11:00:53 +0900 |
| commit | 3d7dd2d3b6ccc8903a37cffe3a2f39cf1be21c86 (patch) | |
| tree | 3b3c62f332aaa3fc34cbc8dd85ea2c47d39ee743 | |
| parent | config: complain about --local outside of a git repo (diff) | |
| download | tgif-3d7dd2d3b6ccc8903a37cffe3a2f39cf1be21c86.tar.xz | |
usage: add NORETURN to BUG() function definitions
Commit d8193743e0 ("usage.c: add BUG() function", 12-05-2017) added the
BUG() functions and macros as a replacement for calls to die("BUG: ..").
The use of NORETURN on the declarations (in git-compat-util.h) and the
lack of NORETURN on the function definitions, however, leads sparse to
complain thus:
SP usage.c
usage.c:220:6: error: symbol 'BUG_fl' redeclared with different type
(originally declared at git-compat-util.h:1074) - different modifiers
In order to suppress the sparse error, add the NORETURN to the function
definitions.
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | usage.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -217,7 +217,7 @@ static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_lis } #ifdef HAVE_VARIADIC_MACROS -void BUG_fl(const char *file, int line, const char *fmt, ...) +NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -225,7 +225,7 @@ void BUG_fl(const char *file, int line, const char *fmt, ...) va_end(ap); } #else -void BUG(const char *fmt, ...) +NORETURN void BUG(const char *fmt, ...) { va_list ap; va_start(ap, fmt); |