From 3d7dd2d3b6ccc8903a37cffe3a2f39cf1be21c86 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Sun, 21 May 2017 23:25:39 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- usage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index 7e6cb20280..1f63e033e9 100644 --- a/usage.c +++ b/usage.c @@ -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); -- cgit v1.2.3