Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:31:44 UTC 2011
Modified Files:
src/usr.bin/systat: extern.h main.c
Log Message:
Consistently use __dead and __printflike.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/systat/extern.h
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/systat/main.c
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/systat/extern.h
diff -u src/usr.bin/systat/extern.h:1.40 src/usr.bin/systat/extern.h:1.41
--- src/usr.bin/systat/extern.h:1.40 Thu Apr 10 17:14:25 2008
+++ src/usr.bin/systat/extern.h Tue Sep 6 18:31:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.40 2008/04/10 17:14:25 thorpej Exp $ */
+/* $NetBSD: extern.h,v 1.41 2011/09/06 18:31:44 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -88,13 +88,12 @@
void command(char *);
void df_all(char *);
void df_some(char *);
-void die(int);
+void die(int) __dead;
void disks_add(char *);
void disks_remove(char *);
void disks_drives(char *);
void display(int);
-void error(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void error(const char *, ...) __printflike(1, 2);
void fetchbufcache(void);
void fetchdf(void);
void fetchicmp(void);
@@ -111,7 +110,7 @@
void global_help(char *);
void global_interval(char *);
void global_load(char *);
-void global_quit(char *);
+void global_quit(char *) __dead;
void global_stop(char *);
void icmp_boot(char *);
void icmp_run(char *);
@@ -138,7 +137,7 @@
void ip_run(char *);
void ip_time(char *);
void ip_zero(char *);
-void keyboard(void) __attribute__((__noreturn__));
+void keyboard(void) __dead;
ssize_t kvm_ckread(const void *, void *, size_t, const char *);
void labelbufcache(void);
void labeldf(void);
@@ -164,7 +163,7 @@
void netstat_show(char *);
void netstat_tcp(char *);
void netstat_udp(char *);
-void nlisterr(struct nlist []) __attribute__((__noreturn__));
+void nlisterr(struct nlist []) __dead;
WINDOW *openbufcache(void);
WINDOW *opendf(void);
WINDOW *openicmp(void);
Index: src/usr.bin/systat/main.c
diff -u src/usr.bin/systat/main.c:1.45 src/usr.bin/systat/main.c:1.46
--- src/usr.bin/systat/main.c:1.45 Wed Nov 4 21:46:24 2009
+++ src/usr.bin/systat/main.c Tue Sep 6 18:31:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.45 2009/11/04 21:46:24 dsl Exp $ */
+/* $NetBSD: main.c,v 1.46 2011/09/06 18:31:44 joerg Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: main.c,v 1.45 2009/11/04 21:46:24 dsl Exp $");
+__RCSID("$NetBSD: main.c,v 1.46 2011/09/06 18:31:44 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -93,8 +93,7 @@
static void (*sv_stop_handler)(int);
static void stop(int);
-static void usage(void);
-int main(int, char **);
+__dead static void usage(void);
gid_t egid; /* XXX needed by initiostat() and initkre() */
