Module Name: src
Committed By: lukem
Date: Tue Apr 7 12:38:13 UTC 2009
Modified Files:
src/sbin/restore: dirs.c interactive.c symtab.c tape.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sbin/restore/dirs.c
cvs rdiff -u -r1.25 -r1.26 src/sbin/restore/interactive.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/restore/symtab.c
cvs rdiff -u -r1.62 -r1.63 src/sbin/restore/tape.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/restore/dirs.c
diff -u src/sbin/restore/dirs.c:1.47 src/sbin/restore/dirs.c:1.48
--- src/sbin/restore/dirs.c:1.47 Wed Feb 18 13:14:12 2009
+++ src/sbin/restore/dirs.c Tue Apr 7 12:38:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dirs.c,v 1.47 2009/02/18 13:14:12 yamt Exp $ */
+/* $NetBSD: dirs.c,v 1.48 2009/04/07 12:38:12 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: dirs.c,v 1.47 2009/02/18 13:14:12 yamt Exp $");
+__RCSID("$NetBSD: dirs.c,v 1.48 2009/04/07 12:38:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -230,7 +230,7 @@
{
struct inotab *itp;
struct direct *dp;
- int namelen;
+ size_t namelen;
long bpt;
char locname[MAXPATHLEN + 1];
Index: src/sbin/restore/interactive.c
diff -u src/sbin/restore/interactive.c:1.25 src/sbin/restore/interactive.c:1.26
--- src/sbin/restore/interactive.c:1.25 Mon Dec 18 20:07:32 2006
+++ src/sbin/restore/interactive.c Tue Apr 7 12:38:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interactive.c,v 1.25 2006/12/18 20:07:32 christos Exp $ */
+/* $NetBSD: interactive.c,v 1.26 2009/04/07 12:38:12 lukem Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)interactive.c 8.5 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: interactive.c,v 1.25 2006/12/18 20:07:32 christos Exp $");
+__RCSID("$NetBSD: interactive.c,v 1.26 2009/04/07 12:38:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -71,7 +71,7 @@
struct afile {
ino_t fnum; /* inode number of file */
char *fname; /* file name */
- short len; /* name length */
+ size_t len; /* name length */
char prefix; /* prefix character */
char postfix; /* postfix character */
};
@@ -650,8 +650,10 @@
formatf(struct afile *list, int nentry)
{
struct afile *fp, *endlist;
- int width, bigino, haveprefix, havepostfix;
- int i, j, w, precision, columns, lines;
+ int haveprefix, havepostfix;
+ ino_t bigino;
+ size_t width, w;
+ int i, j, precision, columns, lines;
width = 0;
haveprefix = 0;
Index: src/sbin/restore/symtab.c
diff -u src/sbin/restore/symtab.c:1.24 src/sbin/restore/symtab.c:1.25
--- src/sbin/restore/symtab.c:1.24 Sun Feb 22 15:28:43 2009
+++ src/sbin/restore/symtab.c Tue Apr 7 12:38:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: symtab.c,v 1.24 2009/02/22 15:28:43 yamt Exp $ */
+/* $NetBSD: symtab.c,v 1.25 2009/04/07 12:38:12 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)symtab.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: symtab.c,v 1.24 2009/02/22 15:28:43 yamt Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.25 2009/04/07 12:38:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -450,6 +450,7 @@
{
struct entry *ep, *tep;
ino_t i;
+ long l;
struct entry temp, *tentry;
long mynum = 1, stroff = 0;
FILE *fd;
@@ -505,11 +506,11 @@
/*
* Convert entry pointers to indexes, and output
*/
- for (i = 0; i < entrytblsize; i++) {
- if (entry[i] == NULL)
+ for (l = 0; l < entrytblsize; l++) {
+ if (entry[l] == NULL)
tentry = NULL;
else
- tentry = (struct entry *)(long)entry[i]->e_index;
+ tentry = (struct entry *)(long)entry[l]->e_index;
(void) fwrite((char *)&tentry, sizeof(struct entry *), 1, fd);
}
hdr.volno = checkpt;
Index: src/sbin/restore/tape.c
diff -u src/sbin/restore/tape.c:1.62 src/sbin/restore/tape.c:1.63
--- src/sbin/restore/tape.c:1.62 Wed Feb 18 13:13:27 2009
+++ src/sbin/restore/tape.c Tue Apr 7 12:38:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tape.c,v 1.62 2009/02/18 13:13:27 yamt Exp $ */
+/* $NetBSD: tape.c,v 1.63 2009/04/07 12:38:13 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: tape.c,v 1.62 2009/02/18 13:13:27 yamt Exp $");
+__RCSID("$NetBSD: tape.c,v 1.63 2009/04/07 12:38:13 lukem Exp $");
#endif
#endif /* not lint */
@@ -864,7 +864,7 @@
for (i = 0; i < spcl.c_count; i++) {
if (spcl.c_addr[i]) {
readtape(&buf[curblk++][0]);
- if (curblk == fssize / TP_BSIZE) {
+ if ((uint32_t)curblk == fssize / TP_BSIZE) {
(*fill)((char *)buf, (long)(size > TP_BSIZE ?
fssize : (curblk - 1) * TP_BSIZE + size));
curblk = 0;
