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.

4 files changed, 15 insertions, 15 deletions

diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 8855206..c7288e2 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 25c5ad6..153fc51 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 b34ab2c..4763f43 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 d1de0bc..02f7ccc 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,