Fix signed/unsigned comparison warnings, and shadow warnings.

This commit is contained in:
thorpej 2002-11-11 23:43:03 +00:00
parent ff64706c9f
commit 4ba7375da3
2 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: rexec.c,v 1.14 2001/11/05 14:59:21 lukem Exp $ */
/* $NetBSD: rexec.c,v 1.15 2002/11/11 23:43:03 thorpej Exp $ */
/*
* Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: rexec.c,v 1.14 2001/11/05 14:59:21 lukem Exp $");
__RCSID("$NetBSD: rexec.c,v 1.15 2002/11/11 23:43:03 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -98,7 +98,7 @@ retry:
rsin.sin_len = sizeof(rsin);
rsin.sin_port = rport;
/* Avoid data corruption from bogus DNS results */
if (hp->h_length > sizeof(rsin.sin_addr))
if (hp->h_length > (int) sizeof(rsin.sin_addr))
len = sizeof(rsin.sin_addr);
else
len = hp->h_length;

View File

@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: regexp.c,v 1.14 2000/09/14 01:24:32 msaitoh Exp $");
__RCSID("$NetBSD: regexp.c,v 1.15 2002/11/11 23:43:03 thorpej Exp $");
#endif /* LIBC_SCCS and not lint */
#include <ctype.h>
@ -206,8 +206,8 @@ STATIC int strcspn __P((char *, char *));
* of the structure of the compiled regexp.
*/
regexp *
__compat_regcomp(exp)
const char *exp;
__compat_regcomp(expn)
const char *expn;
{
regexp *r;
char *scan;
@ -215,15 +215,15 @@ const char *exp;
int len;
int flags;
if (exp == NULL)
if (expn == NULL)
FAIL("NULL argument");
/* First pass: determine size, legality. */
#ifdef notdef
if (exp[0] == '.' && exp[1] == '*') exp += 2; /* aid grep */
if (expn[0] == '.' && expn[1] == '*') expn += 2; /* aid grep */
#endif
/* LINTED const castaway */
regparse = (char *)exp;
regparse = (char *)expn;
regnpar = 1;
regsize = 0L;
regcode = &regdummy;
@ -242,7 +242,7 @@ const char *exp;
/* Second pass: emit code. */
/* LINTED const castaway */
regparse = (char *)exp;
regparse = (char *)expn;
regnpar = 1;
regcode = r->program;
regc(MAGIC);
@ -276,7 +276,7 @@ const char *exp;
longest = NULL;
len = 0;
for (; scan != NULL; scan = regnext(scan))
if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
if (OP(scan) == EXACTLY && (int) strlen(OPERAND(scan)) >= len) {
longest = OPERAND(scan);
len = strlen(OPERAND(scan));
}