[src/trunk]: src/sbin/dump unifdef sunos

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/18f0321db564
branches:  trunk
changeset: 519649:18f0321db564
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Dec 23 12:54:53 2001 +0000

description:
unifdef sunos

diffstat:

 sbin/dump/dumprmt.c   |  10 ++--------
 sbin/dump/ffs_inode.c |  12 ++----------
 sbin/dump/itime.c     |  12 ++----------
 sbin/dump/main.c      |  11 ++---------
 sbin/dump/tape.c      |  15 ++-------------
 sbin/dump/traverse.c  |  12 ++----------
 6 files changed, 12 insertions(+), 60 deletions(-)

diffs (215 lines):

diff -r 83eb7505b3e1 -r 18f0321db564 sbin/dump/dumprmt.c
--- a/sbin/dump/dumprmt.c       Sun Dec 23 12:29:55 2001 +0000
+++ b/sbin/dump/dumprmt.c       Sun Dec 23 12:54:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumprmt.c,v 1.27 2001/12/14 14:43:33 bouyer Exp $      */
+/*     $NetBSD: dumprmt.c,v 1.28 2001/12/23 12:54:53 lukem Exp $       */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dumprmt.c  8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dumprmt.c,v 1.27 2001/12/14 14:43:33 bouyer Exp $");
+__RCSID("$NetBSD: dumprmt.c,v 1.28 2001/12/23 12:54:53 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,13 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#ifdef sunos
-#include <sys/vnode.h>
-
-#include <ufs/inode.h>
-#else
 #include <ufs/ufs/dinode.h>
-#endif
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r 83eb7505b3e1 -r 18f0321db564 sbin/dump/ffs_inode.c
--- a/sbin/dump/ffs_inode.c     Sun Dec 23 12:29:55 2001 +0000
+++ b/sbin/dump/ffs_inode.c     Sun Dec 23 12:54:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_inode.c,v 1.9 2001/12/22 08:05:24 lukem Exp $ */
+/*     $NetBSD: ffs_inode.c,v 1.10 2001/12/23 12:54:53 lukem Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -40,24 +40,16 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: ffs_inode.c,v 1.9 2001/12/22 08:05:24 lukem Exp $");
+__RCSID("$NetBSD: ffs_inode.c,v 1.10 2001/12/23 12:54:53 lukem Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#ifdef sunos
-#include <sys/vnode.h>
-
-#include <ufs/fs.h>
-#include <ufs/fsdir.h>
-#include <ufs/inode.h>
-#else
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
-#endif
 
 #include <protocols/dumprestore.h>
 
diff -r 83eb7505b3e1 -r 18f0321db564 sbin/dump/itime.c
--- a/sbin/dump/itime.c Sun Dec 23 12:29:55 2001 +0000
+++ b/sbin/dump/itime.c Sun Dec 23 12:54:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: itime.c,v 1.11 2001/05/28 01:09:55 lukem Exp $ */
+/*     $NetBSD: itime.c,v 1.12 2001/12/23 12:54:53 lukem Exp $ */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -38,21 +38,13 @@
 #if 0
 static char sccsid[] = "@(#)itime.c    8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: itime.c,v 1.11 2001/05/28 01:09:55 lukem Exp $");
+__RCSID("$NetBSD: itime.c,v 1.12 2001/12/23 12:54:53 lukem Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
-#ifdef sunos
-#include <sys/vnode.h>
-
-#include <ufs/fsdir.h>
-#include <ufs/inode.h>
-#include <ufs/fs.h>
-#else
 #include <ufs/ufs/dinode.h>
-#endif
 
 #include <protocols/dumprestore.h>
 
diff -r 83eb7505b3e1 -r 18f0321db564 sbin/dump/main.c
--- a/sbin/dump/main.c  Sun Dec 23 12:29:55 2001 +0000
+++ b/sbin/dump/main.c  Sun Dec 23 12:54:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.45 2001/12/23 12:29:56 lukem Exp $  */
+/*     $NetBSD: main.c,v 1.46 2001/12/23 12:54:54 lukem Exp $  */
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.6 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.45 2001/12/23 12:29:56 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.46 2001/12/23 12:54:54 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -52,16 +52,9 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 
-#ifdef sunos
-#include <sys/vnode.h>
-
-#include <ufs/inode.h>
-#include <ufs/fs.h>
-#else
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
-#endif
 
 #include <protocols/dumprestore.h>
 
diff -r 83eb7505b3e1 -r 18f0321db564 sbin/dump/tape.c
--- a/sbin/dump/tape.c  Sun Dec 23 12:29:55 2001 +0000
+++ b/sbin/dump/tape.c  Sun Dec 23 12:54:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tape.c,v 1.33 2001/12/23 12:29:57 lukem Exp $  */
+/*     $NetBSD: tape.c,v 1.34 2001/12/23 12:54:54 lukem Exp $  */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c     8.4 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.33 2001/12/23 12:29:57 lukem Exp $");
+__RCSID("$NetBSD: tape.c,v 1.34 2001/12/23 12:54:54 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,14 +46,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-#ifdef sunos
-#include <sys/vnode.h>
-
-#include <ufs/fs.h>
-#include <ufs/inode.h>
-#else
 #include <ufs/ufs/dinode.h>
-#endif
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 
@@ -588,11 +581,7 @@
        int     status;
        int     waitforpid;
        char    *p;
-#ifdef sunos
-       void    (*interrupt_save)();
-#else
        sig_t   interrupt_save;
-#endif
 
        interrupt_save = signal(SIGINT, SIG_IGN);
        parentpid = getpid();
diff -r 83eb7505b3e1 -r 18f0321db564 sbin/dump/traverse.c
--- a/sbin/dump/traverse.c      Sun Dec 23 12:29:55 2001 +0000
+++ b/sbin/dump/traverse.c      Sun Dec 23 12:54:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: traverse.c,v 1.33 2001/11/01 08:03:03 lukem Exp $      */
+/*     $NetBSD: traverse.c,v 1.34 2001/12/23 12:54:54 lukem Exp $      */
 
 /*-
  * Copyright (c) 1980, 1988, 1991, 1993
@@ -38,25 +38,17 @@
 #if 0
 static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
 #else
-__RCSID("$NetBSD: traverse.c,v 1.33 2001/11/01 08:03:03 lukem Exp $");
+__RCSID("$NetBSD: traverse.c,v 1.34 2001/12/23 12:54:54 lukem Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#ifdef sunos
-#include <sys/vnode.h>
-
-#include <ufs/fs.h>
-#include <ufs/fsdir.h>
-#include <ufs/inode.h>
-#else
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
-#endif
 
 #include <protocols/dumprestore.h>