aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/err.h20
-rw-r--r--include/math.h106
-rw-r--r--include/setjmp.h3
-rw-r--r--include/stdlib.h18
-rw-r--r--include/unistd.h6
-rw-r--r--lib/libc/gen/err.c8
-rw-r--r--lib/libc/locale/collate.c7
-rw-r--r--libexec/mail.local/mail.local.c2
-rw-r--r--sbin/dump/dump.h4
-rw-r--r--sbin/dump/main.c4
-rw-r--r--sbin/dump/tape.c2
-rw-r--r--sbin/fsck/fsck.h4
-rw-r--r--sbin/fsck/utilities.c4
-rw-r--r--sbin/fsck_ffs/fsck.h4
-rw-r--r--sbin/fsck_ffs/utilities.c4
-rw-r--r--sbin/fsck_ifs/fsck.h4
-rw-r--r--sbin/fsck_ifs/utilities.c4
-rw-r--r--sbin/i386/mount_msdos/mount_msdos.c4
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c4
-rw-r--r--sbin/mount_lfs/mount_lfs.c4
-rw-r--r--sbin/mount_msdos/mount_msdos.c4
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c4
-rw-r--r--sbin/mount_nfs/mount_nfs.c6
-rw-r--r--sbin/mount_null/mount_null.c4
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c4
-rw-r--r--sbin/mount_portal/mount_portal.c4
-rw-r--r--sbin/mount_portalfs/mount_portalfs.c4
-rw-r--r--sbin/mount_std/mount_std.c4
-rw-r--r--sbin/mount_umap/mount_umap.c4
-rw-r--r--sbin/mount_umapfs/mount_umapfs.c4
-rw-r--r--sbin/mount_union/mount_union.c2
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c2
-rw-r--r--sbin/restore/dirs.c2
-rw-r--r--sbin/restore/extern.h2
-rw-r--r--sbin/route/route.c6
-rw-r--r--usr.bin/rlogin/rlogin.c10
-rw-r--r--usr.bin/script/script.c14
-rw-r--r--usr.bin/tftp/main.c4
-rw-r--r--usr.bin/touch/touch.c2
-rw-r--r--usr.sbin/mount_portalfs/mount_portalfs.c4
40 files changed, 152 insertions, 154 deletions
diff --git a/include/err.h b/include/err.h
index 2f065e73ef53..fd02a61b8b99 100644
--- a/include/err.h
+++ b/include/err.h
@@ -47,16 +47,16 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-__dead void err __P((int, const char *, ...)) __dead2;
-__dead void verr __P((int, const char *, _BSD_VA_LIST_)) __dead2;
-__dead void errx __P((int, const char *, ...)) __dead2;
-__dead void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead2;
-void warn __P((const char *, ...));
-void vwarn __P((const char *, _BSD_VA_LIST_));
-void warnx __P((const char *, ...));
-void vwarnx __P((const char *, _BSD_VA_LIST_));
-void err_set_file __P((void *));
-void err_set_exit __P((void (*)__P((int))));
+void err __P((int, const char *, ...)) __dead2;
+void verr __P((int, const char *, _BSD_VA_LIST_)) __dead2;
+void errx __P((int, const char *, ...)) __dead2;
+void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead2;
+void warn __P((const char *, ...));
+void vwarn __P((const char *, _BSD_VA_LIST_));
+void warnx __P((const char *, ...));
+void vwarnx __P((const char *, _BSD_VA_LIST_));
+void err_set_file __P((void *));
+void err_set_exit __P((void (*)(int)));
__END_DECLS
#endif /* !_ERR_H_ */
diff --git a/include/math.h b/include/math.h
index 214b80e2c839..c0d1dddcb075 100644
--- a/include/math.h
+++ b/include/math.h
@@ -72,61 +72,69 @@
#include <sys/cdefs.h>
+/*
+ * Most of these functions have the side effect of setting errno, except
+ * in the (broken) BSD libm, so they not declared as __pure2.
+ */
__BEGIN_DECLS
-__pure double acos __P((double));
-__pure double asin __P((double));
-__pure double atan __P((double));
-__pure double atan2 __P((double, double));
-__pure double ceil __P((double));
-__pure double cos __P((double));
-__pure double cosh __P((double));
-__pure double exp __P((double));
-__pure double fabs __P((double));
-__pure double floor __P((double));
-__pure double fmod __P((double, double));
- double frexp __P((double, int *));
-__pure double ldexp __P((double, int));
-__pure double log __P((double));
-__pure double log10 __P((double));
- double modf __P((double, double *));
-__pure double pow __P((double, double));
-__pure double sin __P((double));
-__pure double sinh __P((double));
-__pure double sqrt __P((double));
-__pure double tan __P((double));
-__pure double tanh __P((double));
+double acos __P((double));
+double asin __P((double));
+double atan __P((double));
+double atan2 __P((double, double));
+double ceil __P((double));
+double cos __P((double));
+double cosh __P((double));
+double exp __P((double));
+double fabs __P((double));
+double floor __P((double));
+double fmod __P((double, double));
+double frexp __P((double, int *)); /* fundamentally !__pure2 */
+double ldexp __P((double, int));
+double log __P((double));
+double log10 __P((double));
+double modf __P((double, double *)); /* fundamentally !__pure2 */
+double pow __P((double, double));
+double sin __P((double));
+double sinh __P((double));
+double sqrt __P((double));
+double tan __P((double));
+double tanh __P((double));
+/*
+ * These functions are non-ANSI so they can be "right". The ones that
+ * don't set errno in [lib]msun are declared as __pure2.
+ */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-__pure double acosh __P((double));
-__pure double asinh __P((double));
-__pure double atanh __P((double));
- double cabs(); /* we can't describe cabs()'s argument properly */
-__pure double cbrt __P((double));
-__pure double copysign __P((double, double));
-__pure double drem __P((double, double));
-__pure double erf __P((double));
-__pure double erfc __P((double));
-__pure double expm1 __P((double));
-__pure int finite __P((double));
-__pure double hypot __P((double, double));
+double acosh __P((double));
+double asinh __P((double));
+double atanh __P((double));
+double cabs(); /* we can't describe cabs()'s argument properly */
+double cbrt __P((double)) __pure2;
+double copysign __P((double, double)) __pure2;
+double drem __P((double, double));
+double erf __P((double));
+double erfc __P((double)) __pure2;
+double expm1 __P((double)) __pure2;
+int finite __P((double)) __pure2;
+double hypot __P((double, double));
#if defined(vax) || defined(tahoe)
-__pure double infnan __P((int));
+double infnan __P((int));
#endif
-__pure int isinf __P((double));
-__pure int isnan __P((double));
-__pure double j0 __P((double));
-__pure double j1 __P((double));
-__pure double jn __P((int, double));
-__pure double lgamma __P((double));
-__pure double log1p __P((double));
-__pure double logb __P((double));
-__pure double rint __P((double));
-__pure double scalb __P((double, int));
-__pure double y0 __P((double));
-__pure double y1 __P((double));
-__pure double yn __P((int, double));
+int isinf __P((double)) __pure2;
+int isnan __P((double)) __pure2;
+double j0 __P((double));
+double j1 __P((double));
+double jn __P((int, double));
+double lgamma __P((double));
+double log1p __P((double)) __pure2;
+double logb __P((double)) __pure2;
+double rint __P((double)) __pure2;
+double scalb __P((double, int));
+double y0 __P((double));
+double y1 __P((double));
+double yn __P((int, double));
#endif
__END_DECLS
-#endif /* _MATH_H_ */
+#endif /* !_MATH_H_ */
diff --git a/include/setjmp.h b/include/setjmp.h
index 89b4e3dd9ab4..5dcc8ee9564d 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -80,18 +80,15 @@ typedef struct { int _jb[_JBLEN + 1]; } jmp_buf[1];
__BEGIN_DECLS
int setjmp __P((jmp_buf));
-__dead
void longjmp __P((jmp_buf, int)) __dead2;
#ifndef _ANSI_SOURCE
int sigsetjmp __P((sigjmp_buf, int));
-__dead
void siglongjmp __P((sigjmp_buf, int)) __dead2;
#endif /* not ANSI */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
int _setjmp __P((jmp_buf));
-__dead
void _longjmp __P((jmp_buf, int)) __dead2;
void longjmperror __P((void));
#endif /* neither ANSI nor POSIX */
diff --git a/include/stdlib.h b/include/stdlib.h
index 069656d4719b..840238eb41e4 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -80,10 +80,8 @@ extern int __mb_cur_max;
#include <sys/cdefs.h>
__BEGIN_DECLS
-__dead void
- abort __P((void)) __dead2;
-__pure int
- abs __P((int)) __pure2;
+void abort __P((void)) __dead2;
+int abs __P((int)) __pure2;
int atexit __P((void (*)(void)));
double atof __P((const char *));
int atoi __P((const char *));
@@ -91,16 +89,12 @@ long atol __P((const char *));
void *bsearch __P((const void *, const void *, size_t,
size_t, int (*)(const void *, const void *)));
void *calloc __P((size_t, size_t));
-__pure div_t
- div __P((int, int)) __pure2;
-__dead void
- exit __P((int)) __dead2;
+div_t div __P((int, int)) __pure2;
+void exit __P((int)) __dead2;
void free __P((void *));
char *getenv __P((const char *));
-__pure long
- labs __P((long)) __pure2;
-__pure ldiv_t
- ldiv __P((long, long)) __pure2;
+long labs __P((long)) __pure2;
+ldiv_t ldiv __P((long, long)) __pure2;
void *malloc __P((size_t));
void qsort __P((void *, size_t, size_t,
int (*)(const void *, const void *)));
diff --git a/include/unistd.h b/include/unistd.h
index 8094bd6bff15..7428f5dd1dc5 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -49,8 +49,7 @@
#endif
__BEGIN_DECLS
-__dead void
- _exit __P((int)) __dead2;
+void _exit __P((int)) __dead2;
int access __P((const char *, int));
unsigned int alarm __P((unsigned int));
int chdir __P((const char *));
@@ -121,8 +120,7 @@ int getgrouplist __P((const char *, int, int *, int *));
long gethostid __P((void));
int gethostname __P((char *, int));
mode_t getmode __P((const void *, mode_t));
-__pure int
- getpagesize __P((void));
+int getpagesize __P((void)) __pure2;
char *getpass __P((const char *));
char *getusershell __P((void));
char *getwd __P((char *)); /* obsoleted by getcwd() */
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 63ef8a4de346..bf7d3470515c 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -67,7 +67,7 @@ err_set_exit(void (*ef)(int))
err_exit = ef;
}
-__dead void
+void
#ifdef __STDC__
err(int eval, const char *fmt, ...)
#else
@@ -87,7 +87,7 @@ err(eval, fmt, va_alist)
va_end(ap);
}
-__dead void
+void
verr(eval, fmt, ap)
int eval;
const char *fmt;
@@ -109,7 +109,7 @@ verr(eval, fmt, ap)
exit(eval);
}
-__dead void
+void
#if __STDC__
errx(int eval, const char *fmt, ...)
#else
@@ -129,7 +129,7 @@ errx(eval, fmt, va_alist)
va_end(ap);
}
-__dead void
+void
verrx(eval, fmt, ap)
int eval;
const char *fmt;
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index ef73cefebb74..20adda35cb68 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: collate.c,v 1.4 1995/05/30 05:40:40 rgrimes Exp $
+ * $Id: collate.c,v 1.5 1995/10/23 20:08:24 ache Exp $
*/
#include <rune.h>
@@ -52,7 +52,7 @@ struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE];
} \
} while(0)
-__dead void __collate_err(int ex, const char *f) __dead2;
+void __collate_err(int ex, const char *f) __dead2;
int
__collate_load_tables(encoding)
@@ -163,7 +163,8 @@ __collate_strdup(s)
return t;
}
-__dead void __collate_err(int ex, const char *f)
+void
+__collate_err(int ex, const char *f)
{
extern char *__progname; /* Program name, from crt0. */
const char *s;
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index 60df974a8251..c6d869d32b2c 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -71,7 +71,7 @@ int eval = EX_OK; /* sysexits.h error value. */
void deliver __P((int, char *, int));
void e_to_sys __P((int));
-__dead void err __P((const char *, ...));
+void err __P((const char *, ...)) __dead2;
void notifybiff __P((char *));
int store __P((char *));
void usage __P((void));
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 8cdddfcd74f1..4b2330e93a3b 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -122,7 +122,7 @@ void startnewtape __P((int top));
void trewind __P((void));
void writerec __P((char *dp, int isspcl));
-__dead void Exit __P((int status));
+void Exit __P((int status)) __dead2;
void dumpabort __P((int signo));
void getfstab __P((void));
@@ -207,7 +207,7 @@ extern char *strncpy();
extern char *strcat();
extern time_t time();
extern void endgrent();
-extern __dead void exit();
+extern void exit();
extern off_t lseek();
extern const char *strerror();
#endif
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index a1324ddcf4de..408043a20a76 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -85,7 +85,7 @@ long blocksperfile; /* output blocks per file */
char *host = NULL; /* remote host (if any) */
static long numarg __P((int, char *, long, long, int *, char ***));
-static __dead void missingarg __P((int, char *));
+static void missingarg __P((int, char *)) __dead2;
int
main(argc, argv)
@@ -507,7 +507,7 @@ bad:
exit(X_ABORT);
}
-static __dead void
+static void
missingarg(letter, meaning)
int letter;
char *meaning;
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index a7ceba5a0ff2..cc7cc13c8fa2 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -648,7 +648,7 @@ dumpabort(signo)
Exit(X_ABORT);
}
-__dead void
+void
Exit(status)
int status;
{
diff --git a/sbin/fsck/fsck.h b/sbin/fsck/fsck.h
index 24037b61783a..317052f115c2 100644
--- a/sbin/fsck/fsck.h
+++ b/sbin/fsck/fsck.h
@@ -278,14 +278,14 @@ void catch __P((int));
void catchquit __P((int));
void ckfini __P((void));
int dofix __P((struct inodesc *idesc, char *msg));
-__dead void errexit __P((const char *s1, ...)) __dead2;
+void errexit __P((const char *s1, ...)) __dead2;
void flush __P((int fd, struct bufarea *bp));
void freeblk __P((daddr_t blkno, long frags));
int ftypeok __P((struct dinode *dp));
void getblk __P((struct bufarea *bp, daddr_t blk, long size));
struct bufarea * getdatablk __P((daddr_t blkno, long size));
void getpathname __P((char *namebuf, ino_t curdir, ino_t ino));
-__dead void panic __P((const char *, ...)) __dead2;
+void panic __P((const char *, ...)) __dead2;
void pfatal __P((const char *s1, ...));
void pwarn __P((const char *s1, ...));
int reply __P((char *question));
diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c
index 20282159b925..d0c91faa6090 100644
--- a/sbin/fsck/utilities.c
+++ b/sbin/fsck/utilities.c
@@ -527,7 +527,7 @@ dofix(idesc, msg)
}
/* VARARGS1 */
-__dead void
+void
errexit(const char *s1, ...)
{
va_list ap;
@@ -580,7 +580,7 @@ pwarn(const char *s, ...)
/*
* Stub for routines from kernel.
*/
-__dead void
+void
#ifdef __STDC__
panic(const char *fmt, ...)
#else
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 24037b61783a..317052f115c2 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -278,14 +278,14 @@ void catch __P((int));
void catchquit __P((int));
void ckfini __P((void));
int dofix __P((struct inodesc *idesc, char *msg));
-__dead void errexit __P((const char *s1, ...)) __dead2;
+void errexit __P((const char *s1, ...)) __dead2;
void flush __P((int fd, struct bufarea *bp));
void freeblk __P((daddr_t blkno, long frags));
int ftypeok __P((struct dinode *dp));
void getblk __P((struct bufarea *bp, daddr_t blk, long size));
struct bufarea * getdatablk __P((daddr_t blkno, long size));
void getpathname __P((char *namebuf, ino_t curdir, ino_t ino));
-__dead void panic __P((const char *, ...)) __dead2;
+void panic __P((const char *, ...)) __dead2;
void pfatal __P((const char *s1, ...));
void pwarn __P((const char *s1, ...));
int reply __P((char *question));
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 20282159b925..d0c91faa6090 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -527,7 +527,7 @@ dofix(idesc, msg)
}
/* VARARGS1 */
-__dead void
+void
errexit(const char *s1, ...)
{
va_list ap;
@@ -580,7 +580,7 @@ pwarn(const char *s, ...)
/*
* Stub for routines from kernel.
*/
-__dead void
+void
#ifdef __STDC__
panic(const char *fmt, ...)
#else
diff --git a/sbin/fsck_ifs/fsck.h b/sbin/fsck_ifs/fsck.h
index 24037b61783a..317052f115c2 100644
--- a/sbin/fsck_ifs/fsck.h
+++ b/sbin/fsck_ifs/fsck.h
@@ -278,14 +278,14 @@ void catch __P((int));
void catchquit __P((int));
void ckfini __P((void));
int dofix __P((struct inodesc *idesc, char *msg));
-__dead void errexit __P((const char *s1, ...)) __dead2;
+void errexit __P((const char *s1, ...)) __dead2;
void flush __P((int fd, struct bufarea *bp));
void freeblk __P((daddr_t blkno, long frags));
int ftypeok __P((struct dinode *dp));
void getblk __P((struct bufarea *bp, daddr_t blk, long size));
struct bufarea * getdatablk __P((daddr_t blkno, long size));
void getpathname __P((char *namebuf, ino_t curdir, ino_t ino));
-__dead void panic __P((const char *, ...)) __dead2;
+void panic __P((const char *, ...)) __dead2;
void pfatal __P((const char *s1, ...));
void pwarn __P((const char *s1, ...));
int reply __P((char *question));
diff --git a/sbin/fsck_ifs/utilities.c b/sbin/fsck_ifs/utilities.c
index 20282159b925..d0c91faa6090 100644
--- a/sbin/fsck_ifs/utilities.c
+++ b/sbin/fsck_ifs/utilities.c
@@ -527,7 +527,7 @@ dofix(idesc, msg)
}
/* VARARGS1 */
-__dead void
+void
errexit(const char *s1, ...)
{
va_list ap;
@@ -580,7 +580,7 @@ pwarn(const char *s, ...)
/*
* Stub for routines from kernel.
*/
-__dead void
+void
#ifdef __STDC__
panic(const char *fmt, ...)
#else
diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c
index 113e0182d52c..c90d51b311aa 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -30,7 +30,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: mount_msdos.c,v 1.3 1994/11/01 23:51:42 wollman Exp $";
+ "$Id: mount_msdos.c,v 1.4 1996/05/13 17:56:34 wollman Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
@@ -58,7 +58,7 @@ static struct mntopt mopts[] = {
static gid_t a_gid __P((char *));
static uid_t a_uid __P((char *));
static mode_t a_mask __P((char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 79e53dcce868..91d96fd86a8e 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_ext2fs.c,v 1.3 1996/07/23 19:29:27 peter Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -63,7 +63,7 @@ struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
index 3c6e2ddf3ced..67c1b31e2de6 100644
--- a/sbin/mount_lfs/mount_lfs.c
+++ b/sbin/mount_lfs/mount_lfs.c
@@ -42,7 +42,7 @@ static char copyright[] =
static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_lfs.c,v 1.4 1996/05/13 17:43:05 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -64,7 +64,7 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
static void invoke_cleaner __P((char *, int, int));
int
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 113e0182d52c..c90d51b311aa 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -30,7 +30,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: mount_msdos.c,v 1.3 1994/11/01 23:51:42 wollman Exp $";
+ "$Id: mount_msdos.c,v 1.4 1996/05/13 17:56:34 wollman Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
@@ -58,7 +58,7 @@ static struct mntopt mopts[] = {
static gid_t a_gid __P((char *));
static uid_t a_uid __P((char *));
static mode_t a_mask __P((char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 113e0182d52c..c90d51b311aa 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -30,7 +30,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: mount_msdos.c,v 1.3 1994/11/01 23:51:42 wollman Exp $";
+ "$Id: mount_msdos.c,v 1.4 1996/05/13 17:56:34 wollman Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
@@ -58,7 +58,7 @@ static struct mntopt mopts[] = {
static gid_t a_gid __P((char *));
static uid_t a_uid __P((char *));
static mode_t a_mask __P((char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index c03de0c64250..659e26b43ba5 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -45,7 +45,7 @@ static char copyright[] =
static char sccsid[] = "@(#)mount_nfs.c 8.3 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_nfs.c,v 1.13 1996/05/13 17:43:06 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -196,7 +196,7 @@ int getnfsargs __P((char *, struct nfs_args *));
struct iso_addr *iso_addr __P((const char *));
#endif
void set_rpc_maxgrouplist __P((int));
-__dead void usage __P((void));
+void usage __P((void)) __dead2;
int xdr_dir __P((XDR *, char *));
int xdr_fh __P((XDR *, struct nfhret *));
@@ -776,7 +776,7 @@ xdr_fh(xdrsp, np)
return (0);
}
-__dead void
+void
usage()
{
(void)fprintf(stderr, "\
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index d392db7ee0d5..e78c3fc8ea3c 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_null.c 8.5 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_null.c,v 1.4 1996/05/13 17:43:08 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -67,7 +67,7 @@ struct mntopt mopts[] = {
};
int subdir __P((const char *, const char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index d392db7ee0d5..e78c3fc8ea3c 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_null.c 8.5 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_null.c,v 1.4 1996/05/13 17:43:08 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -67,7 +67,7 @@ struct mntopt mopts[] = {
};
int subdir __P((const char *, const char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 6035a1a062a5..1608e22b00e1 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_portal.c 8.4 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_portal.c,v 1.6 1996/05/13 17:43:09 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -74,7 +74,7 @@ struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
static sig_atomic_t readcf; /* Set when SIGHUP received */
diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index 6035a1a062a5..1608e22b00e1 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_portal.c 8.4 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_portal.c,v 1.6 1996/05/13 17:43:09 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -74,7 +74,7 @@ struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
static sig_atomic_t readcf; /* Set when SIGHUP received */
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 6ca3339e45f8..afe035491fc0 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -43,7 +43,7 @@ char copyright[] =
#ifndef lint
static const char rcsid[] =
- "$Id: mount_std.c,v 1.1 1996/05/13 17:43:16 wollman Exp $";
+ "$Id: mount_std.c,v 1.2 1996/05/14 15:16:49 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -63,7 +63,7 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
static const char *fsname;
int
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index ffcbb5f578cb..0542ab33c45b 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_umap.c 8.3 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_umap.c,v 1.6 1996/05/13 17:43:18 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -86,7 +86,7 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index ffcbb5f578cb..0542ab33c45b 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_umap.c 8.3 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_umap.c,v 1.6 1996/05/13 17:43:18 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -86,7 +86,7 @@ static struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index 21a0429effd5..54c464714b05 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -64,7 +64,7 @@ static struct mntopt mopts[] = {
};
static int subdir __P((const char *, const char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 21a0429effd5..54c464714b05 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -64,7 +64,7 @@ static struct mntopt mopts[] = {
};
static int subdir __P((const char *, const char *));
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
int
main(argc, argv)
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 2f8f2e6bda7a..c5d025dd398e 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -737,7 +737,7 @@ inotablookup(ino)
/*
* Clean up and exit
*/
-__dead void
+void
done(exitcode)
int exitcode;
{
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index d82569e3d724..0f64402b33fb 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -45,7 +45,7 @@ void createlinks __P((void));
long deletefile __P((char *, ino_t, int));
void deleteino __P((ino_t));
ino_t dirlookup __P((const char *));
-__dead void done __P((int));
+void done __P((int)) __dead2;
void dumpsymtable __P((char *, long));
void extractdirs __P((int));
int extractfile __P((char *));
diff --git a/sbin/route/route.c b/sbin/route/route.c
index d829ac3e641c..0f39d17216c3 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -43,7 +43,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94";
*/
static const char rcsid[] =
- "$Id: route.c,v 1.13 1996/08/13 22:20:20 julian Exp $";
+ "$Id: route.c,v 1.14 1996/08/19 18:52:49 julian Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -125,9 +125,9 @@ extern char *inet_ntoa(), *iso_ntoa(), *link_ntoa();
extern int ccitt_addr __P((char *, struct sockaddr_x25 *));
#endif
-__dead void usage __P((const char *)) __dead2;
+void usage __P((const char *)) __dead2;
-__dead void
+void
usage(cp)
const char *cp;
{
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 885520627124..c7288e274f82 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -117,8 +117,8 @@ struct winsize winsize;
void catch_child __P((int));
void copytochild __P((int));
-__dead void doit __P((long));
-__dead void done __P((int));
+void doit __P((long)) __dead2;
+void done __P((int)) __dead2;
void echo __P((char));
u_int getescape __P((char *));
void lostpeer __P((int));
@@ -130,7 +130,7 @@ void sendwindow __P((void));
void setsignal __P((int));
void sigwinch __P((int));
void stop __P((char));
-__dead void usage __P((void));
+void usage __P((void)) __dead2;
void writer __P((void));
void writeroob __P((int));
@@ -428,7 +428,7 @@ setsignal(sig)
(void)sigsetmask(omask);
}
-__dead void
+void
done(status)
int status;
{
@@ -889,7 +889,7 @@ warning(fmt, va_alist)
}
#endif
-__dead void
+void
usage()
{
(void)fprintf(stderr,
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 25c5ad6f1e04..153fc51e84c7 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -65,13 +65,13 @@ char *fname;
struct termios tt;
-__dead void done __P((void));
- void dooutput __P((void));
- void doshell __P((void));
- void err __P((const char *, ...));
- void fail __P((void));
- void finish __P((int));
- void scriptflush __P((int));
+void done __P((void)) __dead2;
+void dooutput __P((void));
+void doshell __P((void));
+void err __P((const char *, ...));
+void fail __P((void));
+void finish __P((int));
+void scriptflush __P((int));
int
main(argc, argv)
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index b34ab2c2f0cd..4763f4363cc3 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -97,7 +97,7 @@ void settrace __P((int, char **));
void setverbose __P((int, char **));
void status __P((int, char **));
-static __dead void command __P((void));
+static void command __P((void)) __dead2;
static void getusage __P((char *));
static void makeargv __P((void));
@@ -589,7 +589,7 @@ tail(filename)
/*
* Command parser.
*/
-static __dead void
+static void
command()
{
register struct cmd *c;
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index d1de0bc9283a..02f7ccca8f34 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -333,7 +333,7 @@ err: rval = 1;
return (rval);
}
-__dead void
+void
usage()
{
(void)fprintf(stderr,
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index 6035a1a062a5..1608e22b00e1 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_portal.c 8.4 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: mount_portal.c,v 1.6 1996/05/13 17:43:09 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -74,7 +74,7 @@ struct mntopt mopts[] = {
{ NULL }
};
-static __dead void usage __P((void)) __dead2;
+static void usage __P((void)) __dead2;
static sig_atomic_t readcf; /* Set when SIGHUP received */