Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:46:22 UTC 2011
Modified Files:
src/usr.bin/window: main.c ww.h
Log Message:
Use __printflike and __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/window/main.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/window/ww.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/window/main.c
diff -u src/usr.bin/window/main.c:1.17 src/usr.bin/window/main.c:1.18
--- src/usr.bin/window/main.c:1.17 Sat Aug 13 14:11:16 2011
+++ src/usr.bin/window/main.c Tue Sep 6 18:46:21 2011
@@ -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,
Index: src/usr.bin/window/ww.h
diff -u src/usr.bin/window/ww.h:1.18 src/usr.bin/window/ww.h:1.19
--- src/usr.bin/window/ww.h:1.18 Tue Apr 14 08:50:06 2009
+++ src/usr.bin/window/ww.h Tue Sep 6 18:46:21 2011
@@ -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);
