We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.

1 files changed, 2 insertions, 70 deletions

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 37e1561cd37..567208bc012 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $	*/
+/*	$OpenBSD: ar_io.c,v 1.26 2002/02/19 19:39:35 millert Exp $	*/
 /*	$NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ar_io.c,v 1.26 2002/02/19 19:39:35 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -103,14 +103,8 @@ static void ar_start_gzip(int, const char *, int);
  *	-1 on failure, 0 otherwise
  */
 
-#ifdef __STDC__
 int
 ar_open(char *name)
-#else
-int
-ar_open(name)
-	char *name;
-#endif
 {
 	struct mtget mb;
 
@@ -308,13 +302,8 @@ ar_open(name)
  * ar_close()
  *	closes archive device, increments volume number, and prints i/o summary
  */
-#ifdef __STDC__
 void
 ar_close(void)
-#else
-void
-ar_close()
-#endif
 {
 
 	if (arfd < 0) {
@@ -430,13 +419,8 @@ ar_close()
  *	other side of the pipe from getting a SIGPIPE (pax will stop
  *	reading an archive once a format dependent trailer is detected).
  */
-#ifdef __STDC__
 void
 ar_drain(void)
-#else
-void
-ar_drain()
-#endif
 {
 	register int res;
 	char drbuf[MAXBLK];
@@ -467,13 +451,8 @@ ar_drain()
  *	0 if all ready to write, -1 otherwise
  */
 
-#ifdef __STDC__
 int
 ar_set_wr(void)
-#else
-int
-ar_set_wr()
-#endif
 {
 	off_t cpos;
 
@@ -510,13 +489,8 @@ ar_set_wr()
  *	0 if we can append, -1 otherwise.
  */
 
-#ifdef __STDC__
 int
 ar_app_ok(void)
-#else
-int
-ar_app_ok()
-#endif
 {
 	if (artyp == ISPIPE) {
 		paxwarn(1, "Cannot append to an archive obtained from a pipe.");
@@ -539,15 +513,8 @@ ar_app_ok()
  *	Number of bytes in buffer. 0 for end of file, -1 for a read error.
  */
 
-#ifdef __STDC__
 int
 ar_read(register char *buf, register int cnt)
-#else
-int
-ar_read(buf, cnt)
-	register char *buf;
-	register int cnt;
-#endif
 {
 	register int res = 0;
 
@@ -629,15 +596,8 @@ ar_read(buf, cnt)
  *	error in the archive occurred.
  */
 
-#ifdef __STDC__
 int
 ar_write(register char *buf, register int bsz)
-#else
-int
-ar_write(buf, bsz)
-	register char *buf;
-	register int bsz;
-#endif
 {
 	register int res;
 	off_t cpos;
@@ -754,13 +714,8 @@ ar_write(buf, bsz)
  *	0 when ok to try i/o again, -1 otherwise.
  */
 
-#ifdef __STDC__
 int
 ar_rdsync(void)
-#else
-int
-ar_rdsync()
-#endif
 {
 	long fsbz;
 	off_t cpos;
@@ -845,15 +800,8 @@ ar_rdsync()
  *	partial move (the amount moved is in skipped)
  */
 
-#ifdef __STDC__
 int
 ar_fow(off_t sksz, off_t *skipped)
-#else
-int
-ar_fow(sksz, skipped)
-	off_t sksz;
-	off_t *skipped;
-#endif
 {
 	off_t cpos;
 	off_t mpos;
@@ -911,14 +859,8 @@ ar_fow(sksz, skipped)
  *	0 if moved the requested distance, -1 on complete failure
  */
 
-#ifdef __STDC__
 int
 ar_rev(off_t sksz)
-#else
-int
-ar_rev(sksz)
-	off_t sksz;
-#endif
 {
 	off_t cpos;
 	struct mtop mb;
@@ -1049,13 +991,8 @@ ar_rev(sksz)
  *	physical block size if ok (ok > 0), -1 otherwise
  */
 
-#ifdef __STDC__
 static int
 get_phys(void)
-#else
-static int
-get_phys()
-#endif
 {
 	register int padsz = 0;
 	register int res;
@@ -1167,13 +1104,8 @@ get_phys()
  *	0 when ready to continue, -1 when all done
  */
 
-#ifdef __STDC__
 int
 ar_next(void)
-#else
-int
-ar_next()
-#endif
 {
 	char buf[PAXPATHLEN+2];
 	static int freeit = 0;