Changed ino_t to dump_ino_t.

[dump.git] / restore / tape.c

diff --git a/restore/tape.c b/restore/tape.c
index 27a98d32bfabe9de89aba4a3d512f8f2c49898ca..d4a46ed78512f21c349ed99cde2d9ec464635bc8 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,10 +46,18 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.26 2001/03/18 15:35:44 stelian Exp $";
+       "$Id: tape.c,v 1.29 2001/03/20 10:02:48 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
+#include <errno.h>
+#include <compaterr.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>
@@ -59,28 +67,17 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <time.h>
 #include <linux/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #else  /* __linux__ */
 #include <ufs/ufs/dinode.h>
 #endif /* __linux__ */
 #include <protocols/dumprestore.h>
 
-#include <errno.h>
-#include <compaterr.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif /* HAVE_ZLIB */
 
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
 #include "restore.h"
 #include "extern.h"
 #include "pathnames.h"
@@ -491,15 +488,9 @@ gethdr:
                goto again;
        }
        if (tmpbuf.c_date != dumpdate || tmpbuf.c_ddate != dumptime) {
-#ifdef __linux__
                fprintf(stderr, "Wrong dump date\n\tgot: %s",
                        ctime4(&tmpbuf.c_date));
-               fprintf(stderr, "\twanted: %s", ctime4(&dumpdate));
-#else
-               fprintf(stderr, "Wrong dump date\n\tgot: %s",
-                       ctime(&tmpbuf.c_date));
                fprintf(stderr, "\twanted: %s", ctime(&dumpdate));
-#endif
                volno = 0;
                haderror = 1;
                goto again;
@@ -599,15 +590,9 @@ setdumpnum(void)
 void
 printdumpinfo(void)
 {
-#ifdef __linux__
        fprintf(stdout, "Dump   date: %s", ctime4(&spcl.c_date));
        fprintf(stdout, "Dumped from: %s",
            (spcl.c_ddate == 0) ? "the epoch\n" : ctime4(&spcl.c_ddate));
-#else
-       fprintf(stdout, "Dump   date: %s", ctime(&spcl.c_date));
-       fprintf(stdout, "Dumped from: %s",
-           (spcl.c_ddate == 0) ? "the epoch\n" : ctime(&spcl.c_ddate));
-#endif
        if (spcl.c_host[0] == '\0')
                return;
        fprintf(stdout, "Level %d dump of %s on %s:%s\n",
@@ -1996,7 +1981,7 @@ good:
 static void
 accthdr(struct s_spcl *header)
 {
-       static ino_t previno = 0x7fffffff;
+       static dump_ino_t previno = 0x7fffffff;
        static int prevtype;
        static long predict;
        long blks, i;