Relicensed dump/restore under the revised BSD license, as per ftp://ftp.cs.berkeley...

[dump.git] / restore / restore.c

diff --git a/restore/restore.c b/restore/restore.c
index 854c3fcd392a9880807c8173bb8e12e4c954c13f..5ac6c870d56949ffe319a22414672f92c05869ce 100644 (file)
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -18,11 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -41,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: restore.c,v 1.29 2002/04/04 08:20:23 stelian Exp $";
+       "$Id: restore.c,v 1.31 2003/03/30 15:40:39 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -159,7 +155,7 @@ addfile(char *name, dump_ino_t ino, int type)
  */
 /* ARGSUSED */
 long
-deletefile(char *name, dump_ino_t ino, int type)
+deletefile(char *name, dump_ino_t ino, UNUSED(int type))
 {
        long descend = hflag ? GOOD : FAIL;
        struct entry *ep;
@@ -951,7 +947,7 @@ createfiles(void)
                        if (volinfo[1] == ROOTINO) {
                                int i, goodvol = 1;
 
-                               for (i = 1; i < TP_NINOS && volinfo[i] != 0; ++i)
+                               for (i = 1; i < (int)TP_NINOS && volinfo[i] != 0; ++i)
                                        if (volinfo[i] < next)
                                                goodvol = i;
 
@@ -1023,7 +1019,7 @@ createfiles(void)
                                msg("inode %ld at tapepos %ld\n", curfile.ino, curtapepos);
 #endif
                                sprintf(gTps, "%ld\t%ld\t%lld\n", (unsigned long)curfile.ino, volno, curtapepos);
-                               if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+                               if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
                                        warn("error writing tapepos file.\n");
                                skipfile();
                        }