[src/trunk]: src/usr.bin/rdist Use __dead and __printflike.

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06ce8cfe9ef4
branches:  trunk
changeset: 769324:06ce8cfe9ef4
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Sep 06 18:28:18 2011 +0000

description:
Use __dead and __printflike.

diffstat:

 usr.bin/rdist/defs.h |  15 ++++++---------
 usr.bin/rdist/main.c |   7 +++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diffs (69 lines):

diff -r ab0b527d5b3e -r 06ce8cfe9ef4 usr.bin/rdist/defs.h
--- a/usr.bin/rdist/defs.h      Tue Sep 06 18:26:55 2011 +0000
+++ b/usr.bin/rdist/defs.h      Tue Sep 06 18:28:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.18 2009/04/13 04:35:36 lukem Exp $  */
+/*     $NetBSD: defs.h,v 1.19 2011/09/06 18:28:18 joerg Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -151,26 +151,23 @@
 
 int     any(int, const char *);
 char   *colon(char *);
-void    cleanup(int);
+void    cleanup(int) __dead;
 void    define(char *);
 void    docmds(char **, int, char **);
-void    error(const char *, ...)
-     __attribute__((__format__(__printf__, 1, 2))) ;
+void    error(const char *, ...) __printflike(1, 2);
 int     except(char *);
 struct namelist *
         expand(struct namelist *, int);
 char   *exptilde(char [], char *);
-void    fatal(const char *, ...)
-     __attribute__((__format__(__printf__, 1, 2)));
+void    fatal(const char *, ...) __printflike(1, 2);
 int     inlist(struct namelist *, char *);
 void    insert(char *,
            struct namelist *, struct namelist *, struct subcmd *);
 void    install(char *, char *, int, int);
-void    dolog(FILE *, const char *, ...)
-     __attribute__((__format__(__printf__, 2, 3)));
+void    dolog(FILE *, const char *, ...) __printflike(2, 3);
 struct namelist *
         lookup(char *, int, struct namelist *);
-void    lostconn(int);
+void    lostconn(int) __dead;
 struct namelist *
         makenl(char *);
 void    freenl(struct namelist *);
diff -r ab0b527d5b3e -r 06ce8cfe9ef4 usr.bin/rdist/main.c
--- a/usr.bin/rdist/main.c      Tue Sep 06 18:26:55 2011 +0000
+++ b/usr.bin/rdist/main.c      Tue Sep 06 18:28:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.19 2008/07/21 14:19:25 lukem Exp $  */
+/*     $NetBSD: main.c,v 1.20 2011/09/06 18:28:18 joerg Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 6/9/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.19 2008/07/21 14:19:25 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.20 2011/09/06 18:28:18 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -80,8 +80,7 @@
 struct passwd *pw;     /* pointer to static area used by getpwent */
 struct group *gr;      /* pointer to static area used by getgrent */
 
-int    main(int, char **);
-static void usage(void);
+__dead static void usage(void);
 static void docmdargs(int, char *[]);
 
 int