On Fri, Feb 05, 2016 at 01:26:02PM +0100, J??r??mie Courr??ges-Anglas wrote:
> The diff below adds __dead to relevant function decls and tidies up
> log.h a bit.
> 
> ok?

OK bluhm@

> 
> Index: log.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rtadvd/log.h,v
> retrieving revision 1.1
> diff -u -p -r1.1 log.h
> --- log.h     21 Apr 2008 20:40:55 -0000      1.1
> +++ log.h     5 Feb 2016 12:22:39 -0000
> @@ -19,10 +19,10 @@
>  void log_init(int);
>  void logit(int pri, const char *fmt, ...);
>  
> -void fatal(const char*);
> +__dead void fatal(const char*);
> +__dead void fatalx(const char*);
> +
>  void log_warn(const char*, ...) __attribute__((format(printf, 1, 2)));
> +void log_warnx(const char*, ...) __attribute__((format(printf, 1, 2)));
>  void log_info(const char*, ...) __attribute__((format(printf, 1, 2)));
>  void log_debug(const char*, ...) __attribute__((format(printf, 1, 2)));
> -
> -void fatalx(const char*);
> -void log_warnx(const char*, ...) __attribute__((format(printf, 1, 2)));
> Index: rtadvd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rtadvd/rtadvd.c,v
> retrieving revision 1.63
> diff -u -p -r1.63 rtadvd.c
> --- rtadvd.c  5 Feb 2016 12:16:21 -0000       1.63
> +++ rtadvd.c  5 Feb 2016 12:22:39 -0000
> @@ -132,7 +132,7 @@ u_int32_t ndopt_flags[] = {
>  
>  static __dead void usage(void);
>  static void set_die(int);
> -static void die(void);
> +static __dead void die(void);
>  static void sock_open(void);
>  static void rtsock_open(void);
>  static void rtadvd_input(void);
> 
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to