xfsprogs: mark some functions as noreturn
PATCH 1/1 xfsprogs: mark some functions as noreturn
Static checkers are a lot less noisy if they know certain functions are noreturn.
Making this change removed about 50 errors from "clang" output.
(http://clang-analyzer.llvm.org) output.
---
mkfs/xfs_mkfs.c +2 -2
@@ -27,7 +27,7 @@*/ static void conflict (char opt,char *tab[],int oldidx,int newidx);static void illegal (char *value,char *opt); -static void reqval (char opt,char *tab[],int idx); +static __attribute__((noreturn))void reqval (char opt,char *tab[],int idx);static void respec (char opt,char *tab[],int idx);static void unknown (char opt,char *s);static int ispow2 (unsigned int i);
@@ -2464,7 +2464,7 @@ ispow2(return (i & (i -1 )) ==0 ; } -static void +static void __attribute__((noreturn)) reqval( char opt, char *tab[],
repair/err_protos.h +8 -4
@@ -16,7 +16,11 @@* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -void do_abort (char const *, ...);/* abort, internal error */ -void do_error (char const *, ...);/* abort, system error */ -void do_warn (char const *, ...);/* issue warning */ -void do_log (char const *, ...);/* issue log message */ +/* abort, internal error */ +void __attribute__((noreturn))do_abort (char const *, ...); +/* abort, system error */ +void __attribute__((noreturn))do_error (char const *, ...); +/* issue warning */ +void do_warn (char const *, ...); +/* issue log message */ +void do_log (char const *, ...);
repair/xfs_repair.c +2 -2
@@ -351,7 +351,7 @@ do_msg(int do_abort, char const *msg, va_list args) } } -void +void __attribute__((noreturn))do_error (char const *msg, ...) {va_list args;
@@ -366,7 +366,7 @@ do_error(char const *msg, ...)* like do_error, only the error is internal, no system * error so no oserror processing */ -void +void __attribute__((noreturn))do_abort (char const *msg, ...) {va_list args;
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 5 lines · Eric Sandeen
Static checkers are a lot less noisy if they know certain functions are noreturn.
Making this change removed about 50 errors from "clang" output.
(http://clang-analyzer.llvm.org) output.
Not pretty but useful,
repair/err_protos.h line 26
Quoted 12 lines
repair/err_protos.h +8
-4-void do_abort (char const *, ...);/* abort, internal error */ -void do_error (char const *, ...);/* abort, system error */ -void do_warn (char const *, ...);/* issue warning */ -void do_log (char const *, ...);/* issue log message */ +/* abort, internal error */ +void __attribute__((noreturn))do_abort (char const *, ...); +/* abort, system error */ +void __attribute__((noreturn))do_error (char const *, ...); +/* issue warning */ +void do_warn (char const *, ...); +/* issue log message */ +void do_log (char const *, ...);
It would be good to add the proper printflike attributes to these to also get vararg typechecking.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH] xfsprogs: fix up the noreturn annotations
In reply to Eric SandeenThe usage function in mkfs needs a noreturn annotation too, otherwise gcc will complain, similarly the do_msg function in repair would need it if do_abort is set, but because conditional annotations aren't possible just clean this area up an inline the do_msg function into it's callers.
mkfs/xfs_mkfs.c +2 -1
@@ -27,6 +27,7 @@*/ static void conflict (char opt,char *tab[],int oldidx,int newidx);static void illegal (char *value,char *opt); +static __attribute__((noreturn))void usage (void );static __attribute__((noreturn))void reqval (char opt,char *tab[],int idx);static void respec (char opt,char *tab[],int idx);static void unknown (char opt,char *s);
@@ -2554,7 +2555,7 @@ cvtnum(return -1LL ; } -void +static void __attribute__((noreturn))usage (void ) { fprintf(stderr, _("Usage: %s\n\
mkfs/xfs_mkfs.h +0 -1
@@ -68,7 +68,6 @@/* xfs_mkfs.c */ -extern void usage (void );extern int isdigits (char *str);extern long long cvtnum (unsigned int blocksize,unsigned int sectorsize,char *s);
repair/xfs_repair.c +10 -16
@@ -339,18 +339,6 @@ process_args(int argc, char **argv)usage (); } -void -do_msg (int do_abort,char const *msg,va_list args) -{ -vfprintf (stderr, msg, args); - -if (do_abort) { -if (dumpcore) -abort (); -exit (1 ); - } -} -void __attribute__((noreturn))do_error (char const *msg, ...) {
@@ -359,7 +347,10 @@ do_error(char const *msg, ...)fprintf (stderr,_ ("\nfatal error -- " ));va_start (args, msg); -do_msg (1 , msg, args); +vfprintf (stderr, msg, args); +if (dumpcore) +abort (); +exit (1 ); }/*
@@ -372,7 +363,10 @@ do_abort(char const *msg, ...)va_list args;va_start (args, msg); -do_msg (1 , msg, args); +vfprintf (stderr, msg, args); +if (dumpcore) +abort (); +exit (1 ); }void
@@ -383,7 +377,7 @@ do_warn(char const *msg, ...) fs_is_dirty =1 ;va_start (args, msg); -do_msg (0 , msg, args); +vfprintf (stderr, msg, args);va_end (args); }
@@ -395,7 +389,7 @@ do_log(char const *msg, ...)va_list args;va_start (args, msg); -do_msg (0 , msg, args); +vfprintf (stderr, msg, args);va_end (args); }
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Eric Sandeen
Reviewed-byRe: [PATCH] xfsprogs: fix up the noreturn annotations
Quoted 8 lines · Christoph Hellwig
The usage function in mkfs needs a noreturn annotation too, otherwise gcc will complain, similarly the
do_msgfunction in repair would need it ifdo_abortis set, but because conditional annotations aren't possible just clean this area up an inline thedo_msgfunction into it's callers.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 99 lines
Index:
xfsprogs-dev/mkfs/xfs_mkfs.c
===================================================================mkfs/xfs_mkfs.c +2
-1@@ -27,6 +27,7 @@*/ static void conflict (char opt,char *tab[],int oldidx,int newidx);static void illegal (char *value,char *opt); +static __attribute__((noreturn))void usage (void );static __attribute__((noreturn))void reqval (char opt,char *tab[],int idx);static void respec (char opt,char *tab[],int idx);static void unknown (char opt,char *s);@@ -2554,7 +2555,7 @@ cvtnum(return -1LL ; } -void +static void __attribute__((noreturn))usage (void ) { fprintf(stderr, _("Usage: %s\n\Index:
xfsprogs-dev/mkfs/xfs_mkfs.h
===================================================================mkfs/xfs_mkfs.h +0
-1@@ -68,7 +68,6 @@/* xfs_mkfs.c */ -extern void usage (void );extern int isdigits (char *str);extern long long cvtnum (unsigned int blocksize,unsigned int sectorsize,char *s);Index:
xfsprogs-dev/repair/xfs_repair.c
===================================================================repair/xfs_repair.c +10
-16@@ -339,18 +339,6 @@ process_args(int argc, char **argv)usage (); } -void -do_msg (int do_abort,char const *msg,va_list args) -{ -vfprintf (stderr, msg, args); - -if (do_abort) { -if (dumpcore) -abort (); -exit (1 ); - } -} -void __attribute__((noreturn))do_error (char const *msg, ...) {@@ -359,7 +347,10 @@ do_error(char const *msg, ...)fprintf (stderr,_ ("\nfatal error -- " ));va_start (args, msg); -do_msg (1 , msg, args); +vfprintf (stderr, msg, args); +if (dumpcore) +abort (); +exit (1 ); }/* @@ -372,7 +363,10 @@ do_abort(char const *msg, ...)va_list args;va_start (args, msg); -do_msg (1 , msg, args); +vfprintf (stderr, msg, args); +if (dumpcore) +abort (); +exit (1 ); }void @@ -383,7 +377,7 @@ do_warn(char const *msg, ...) fs_is_dirty =1 ;va_start (args, msg); -do_msg (0 , msg, args); +vfprintf (stderr, msg, args);va_end (args); }@@ -395,7 +389,7 @@ do_log(char const *msg, ...)va_list args;va_start (args, msg); -do_msg (0 , msg, args); +vfprintf (stderr, msg, args);va_end (args); }
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs