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

usage: add NORETURN to BUG() function definitions

Browse Source 
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>
This commit is contained in:
Ramsay Jones 2017-05-21 23:25:39 +01:00 committed by Junio C Hamano
parent 25cd291963
commit 3d7dd2d3b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usage.c
View File

@ -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);