Don't use __dead or __pure in user code. They were obfuscations

for gcc >= 2.5 and no-ops for gcc >= 2.6.  Converted to use __dead2
or __pure2 where it wasn't already done, except in math.h where use
of __pure was mostly wrong.

27 files changed, 51 insertions, 51 deletions

diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 8cdddfc..4b2330e 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 a1324dd..408043a 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 a7ceba5..cc7cc13 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 24037b6..317052f 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 2028215..d0c91fa 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 24037b6..317052f 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 2028215..d0c91fa 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 24037b6..317052f 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 2028215..d0c91fa 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 113e018..c90d51b 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 79e53dc..91d96fd 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 3c6e2dd..67c1b31 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 113e018..c90d51b 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 113e018..c90d51b 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 c03de0c..659e26b 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 d392db7..e78c3fc 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 d392db7..e78c3fc 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 6035a1a..1608e22 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 6035a1a..1608e22 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 6ca3339..afe0354 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 ffcbb5f..0542ab3 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 ffcbb5f..0542ab3 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 21a0429..54c4647 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 21a0429..54c4647 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 2f8f2e6..c5d025d 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 d82569e..0f64402 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 d829ac3..0f39d17 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;
 {