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

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

details:   https://anonhg.NetBSD.org/src/rev/917d61877787
branches:  trunk
changeset: 769349:917d61877787
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Sep 06 18:46:21 2011 +0000

description:
Use __printflike and __dead.

diffstat:

 usr.bin/window/main.c |  9 ++++-----
 usr.bin/window/ww.h   |  7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 43752e17d545 -r 917d61877787 usr.bin/window/main.c
--- a/usr.bin/window/main.c     Tue Sep 06 18:46:03 2011 +0000
+++ b/usr.bin/window/main.c     Tue Sep 06 18:46:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.17 2011/08/13 14:11:16 wiz Exp $    */
+/*     $NetBSD: main.c,v 1.18 2011/09/06 18:46:21 joerg Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.17 2011/08/13 14:11:16 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.18 2011/09/06 18:46:21 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -58,8 +58,7 @@
 #include "char.h"
 #include "local.h"
 
-int    main(int, char **);
-void   usage(void);
+__dead static void     usage(void);
 
 int
 main(int argc, char **argv)
@@ -190,7 +189,7 @@
        return 0;
 }
 
-void
+static void
 usage(void)
 {
        (void) fprintf(stderr,
diff -r 43752e17d545 -r 917d61877787 usr.bin/window/ww.h
--- a/usr.bin/window/ww.h       Tue Sep 06 18:46:03 2011 +0000
+++ b/usr.bin/window/ww.h       Tue Sep 06 18:46:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ww.h,v 1.18 2009/04/14 08:50:06 lukem Exp $    */
+/*     $NetBSD: ww.h,v 1.19 2011/09/06 18:46:21 joerg Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -353,13 +353,12 @@
 void   wwiomux(void);
 void   wwlabel(struct ww *, struct ww *, int, char *, int);
 void   wwmove(struct ww *, int, int);
-void   wwprintf(struct ww *, const char *, ...)
-    __attribute__((__format__(__printf__, 2, 3)));
+void   wwprintf(struct ww *, const char *, ...) __printflike(2, 3);
 void   wwputc(char, struct ww *);
 void   wwputs(const char *, struct ww *);
 void   wwredraw(void);
 void   wwredrawwin1(struct ww *,int, int, int);
-void   wwquit(int);
+void   wwquit(int) __dead;
 void   wwreset(void);
 void   wwrint(void);
 void   wwscroll(struct ww *, int);