Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sign-compare issues

Browse Source
This commit is contained in:
lukem 2009-04-07 12:38:12 +00:00
parent 5a3a163d1d
commit 292ab8c29d
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/restore/dirs.c
View File

@ -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 @@ treescan(const char *pname, ino_t ino, long (*todo)(const char *, ino_t, int))
{
struct inotab *itp;
struct direct *dp;
int namelen;
size_t namelen;
long bpt;
char locname[MAXPATHLEN + 1];

12
sbin/restore/interactive.c
View File

@ -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 @@ static char *nextarg = NULL;
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 @@ static void
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;

11
sbin/restore/symtab.c
View File

@ -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 @@ dumpsymtable(const char *filename, int32_t checkpt)
{
struct entry *ep, *tep;
ino_t i;
long l;
struct entry temp, *tentry;
long mynum = 1, stroff = 0;
FILE *fd;
@ -505,11 +506,11 @@ dumpsymtable(const char *filename, int32_t checkpt)
/*
* 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;

6
sbin/restore/tape.c
View File

@ -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 @@ loop:
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;