fix lint issues and actual bugs lint found (missing break statements)

This commit is contained in:
christos 2009-04-12 19:43:37 +00:00
parent fe9ffd31fe
commit 50ce2a6bdf
6 changed files with 84 additions and 78 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_name.c,v 1.7 2009/04/12 17:07:17 christos Exp $ */
/* $NetBSD: ns_name.c,v 1.8 2009/04/12 19:43:37 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = "Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp";
#else
__RCSID("$NetBSD: ns_name.c,v 1.7 2009/04/12 17:07:17 christos Exp $");
__RCSID("$NetBSD: ns_name.c,v 1.8 2009/04/12 19:43:37 christos Exp $");
#endif
#endif
@ -760,7 +760,8 @@ ns_name_eq(ns_nname_ct a, size_t as, ns_nname_ct b, size_t bs) {
return (-1);
}
if (ac != bc || strncasecmp((const char *) ++a,
(const char *) ++b, ac) != 0)
(const char *) ++b,
(size_t)ac) != 0)
return (0);
a += ac, b += bc;
}
@ -779,7 +780,7 @@ ns_name_owned(ns_namemap_ct a, int an, ns_namemap_ct b, int bn) {
while (bn > 0) {
if (a->len != b->len ||
strncasecmp((const char *) a->base,
(const char *) b->base, a->len) != 0)
(const char *) b->base, (size_t)a->len) != 0)
return (0);
a++, an--;
b++, bn--;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_parse.c,v 1.7 2009/04/12 17:07:17 christos Exp $ */
/* $NetBSD: ns_parse.c,v 1.8 2009/04/12 19:43:37 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = "Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp";
#else
__RCSID("$NetBSD: ns_parse.c,v 1.7 2009/04/12 17:07:17 christos Exp $");
__RCSID("$NetBSD: ns_parse.c,v 1.8 2009/04/12 19:43:37 christos Exp $");
#endif
#endif
@ -212,7 +212,8 @@ ns_parserr2(ns_msg *handle, ns_sect section, int rrnum, ns_rr2 *rr) {
int tmp;
/* Make section right. */
if ((tmp = section) < 0 || section >= ns_s_max)
tmp = section;
if (tmp < 0 || section >= ns_s_max)
RETERR(ENODEV);
if (section != handle->_sect)
setsection(handle, section);

View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_print.c,v 1.9 2009/04/12 17:07:17 christos Exp $ */
/* $NetBSD: ns_print.c,v 1.10 2009/04/12 19:43:37 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = "Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp";
#else
__RCSID("$NetBSD: ns_print.c,v 1.9 2009/04/12 17:07:17 christos Exp $");
__RCSID("$NetBSD: ns_print.c,v 1.10 2009/04/12 19:43:37 christos Exp $");
#endif
#endif
@ -720,21 +720,21 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
t = ns_get16(rdata);
rdata += NS_INT16SZ;
len = SPRINTF((tmp, "%u ", t));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
} else
if (rdlen < 2U) goto formerr;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
while (rdata < edata) {
len = SPRINTF((tmp, "%02X", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
}
break;
@ -745,17 +745,17 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
u_int t, w, l, j, k, c;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
t = ns_get16(rdata);
rdata += NS_INT16SZ;
len = SPRINTF((tmp, "%u ", t));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
t = *rdata++;
if (t == 0) {
@ -763,7 +763,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
} else {
while (t-- > 0) {
len = SPRINTF((tmp, "%02X", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
}
}
@ -775,54 +775,54 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
while (t > 0) {
switch (t) {
case 1:
tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[((rdata[0]<<2)&0x1c)];
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)];
tmp[2] = tmp[3] = tmp[4] = '=';
tmp[5] = tmp[6] = tmp[7] = '=';
break;
case 2:
tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
((rdata[1]>>6)&0x03)];
tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[((rdata[1]<<4)&0x10)];
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)];
tmp[4] = tmp[5] = tmp[6] = tmp[7] = '=';
break;
case 3:
tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
((rdata[1]>>6)&0x03)];
tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
((rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[((rdata[2]<<1)&0x1e)];
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
(((uint32_t)rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)];
tmp[5] = tmp[6] = tmp[7] = '=';
break;
case 4:
tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
((rdata[1]>>6)&0x03)];
tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
((rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[((rdata[2]<<1)&0x1e)|
((rdata[3]>>7)&0x01)];
tmp[5] = base32hex[((rdata[3]>>2)&0x1f)];
tmp[6] = base32hex[(rdata[3]<<3)&0x18];
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
(((uint32_t)rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)|
(((uint32_t)rdata[3]>>7)&0x01)];
tmp[5] = base32hex[(((uint32_t)rdata[3]>>2)&0x1f)];
tmp[6] = base32hex[((uint32_t)rdata[3]<<3)&0x18];
tmp[7] = '=';
break;
default:
tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
((rdata[1]>>6)&0x03)];
tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
((rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[((rdata[2]<<1)&0x1e)|
((rdata[3]>>7)&0x01)];
tmp[5] = base32hex[((rdata[3]>>2)&0x1f)];
tmp[6] = base32hex[((rdata[3]<<3)&0x18)|
((rdata[4]>>5)&0x07)];
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
(((uint32_t)rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)|
(((uint32_t)rdata[3]>>7)&0x01)];
tmp[5] = base32hex[(((uint32_t)rdata[3]>>2)&0x1f)];
tmp[6] = base32hex[(((uint32_t)rdata[3]<<3)&0x18)|
(((uint32_t)rdata[4]>>5)&0x07)];
tmp[7] = base32hex[(rdata[4]&0x1f)];
break;
}
@ -846,8 +846,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
if ((rdata[j] & (0x80 >> k)) == 0)
continue;
c = w * 256 + j * 8 + k;
len = SPRINTF((tmp, " %s", p_type(c)));
T(addstr(tmp, len, &buf, &buflen));
len = SPRINTF((tmp, " %s", p_type((ns_type)c)));
T(addstr(tmp, (size_t)len, &buf, &buflen));
}
}
rdata += l;
@ -870,8 +870,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
if ((rdata[j] & (0x80 >> k)) == 0)
continue;
c = w * 256 + j * 8 + k;
len = SPRINTF((tmp, " %s", p_type(c)));
T(addstr(tmp, len, &buf, &buflen));
len = SPRINTF((tmp, " %s", p_type((ns_type)c)));
T(addstr(tmp, (size_t)len, &buf, &buflen));
}
}
rdata += l;
@ -890,7 +890,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
const char *str = "record too long to print";
T(addstr(str, strlen(str), &buf, &buflen));
} else {
len = b64_ntop(rdata, edata-rdata, base64_dhcid, siz);
len = b64_ntop(rdata, (size_t)(edata-rdata),
base64_dhcid, siz);
if (len < 0)
goto formerr;
@ -906,12 +907,13 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
for (n = 0; n < len; n += 48) {
T(addstr(leader, strlen(leader),
&buf, &buflen));
T(addstr(base64_dhcid + n, MIN(len - n, 48),
&buf, &buflen));
T(addstr(base64_dhcid + n,
(size_t)MIN(len - n, 48), &buf, &buflen));
}
if (len > 15)
T(addstr(" )", 2, &buf, &buflen));
}
break;
}
case ns_t_ipseckey: {
@ -943,15 +945,15 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
}
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
switch (rdata[-2]) {
@ -981,7 +983,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
const char *str = "record too long to print";
T(addstr(str, strlen(str), &buf, &buflen));
} else {
len = b64_ntop(rdata, edata-rdata, base64_key, siz);
len = b64_ntop(rdata, (size_t)(edata-rdata),
base64_key, siz);
if (len < 0)
goto formerr;
@ -997,12 +1000,13 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
for (n = 0; n < len; n += 48) {
T(addstr(leader, strlen(leader),
&buf, &buflen));
T(addstr(base64_key + n, MIN(len - n, 48),
&buf, &buflen));
T(addstr(base64_key + n,
(size_t)MIN(len - n, 48), &buf, &buflen));
}
if (len > 15)
T(addstr(" )", 2, &buf, &buflen));
}
break;
}
case ns_t_hip: {
@ -1022,11 +1026,11 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
T(addstr(str, strlen(str), &buf, &buflen));
} else {
len = sprintf(tmp, "( %u ", algorithm);
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
for (i = 0; i < hip_len; i++) {
len = sprintf(tmp, "%02X", *rdata);
T(addstr(tmp, len, &buf, &buflen));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
}
T(addstr(leader, strlen(leader), &buf, &buflen));
@ -1035,7 +1039,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
if (len < 0)
goto formerr;
T(addstr(base64_key, len, &buf, &buflen));
T(addstr(base64_key, (size_t)len, &buf, &buflen));
rdata += key_len;
while (rdata < edata) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: res_data.c,v 1.12 2009/04/12 17:07:17 christos Exp $ */
/* $NetBSD: res_data.c,v 1.13 2009/04/12 19:43:37 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = "Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp";
#else
__RCSID("$NetBSD: res_data.c,v 1.12 2009/04/12 17:07:17 christos Exp $");
__RCSID("$NetBSD: res_data.c,v 1.13 2009/04/12 19:43:37 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -327,7 +327,7 @@ u_int
res_randomid(void) {
if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
return (-1);
return (u_int)-1;
}
return (res_nrandomid(&_nres));

View File

@ -1,4 +1,4 @@
/* $NetBSD: res_init.c,v 1.17 2009/04/12 17:07:17 christos Exp $ */
/* $NetBSD: res_init.c,v 1.18 2009/04/12 19:43:37 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@ -76,7 +76,7 @@
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp";
#else
__RCSID("$NetBSD: res_init.c,v 1.17 2009/04/12 17:07:17 christos Exp $");
__RCSID("$NetBSD: res_init.c,v 1.18 2009/04/12 19:43:37 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -695,11 +695,11 @@ res_rndinit(res_state statp)
u_int16_t u16;
gettimeofday(&now, NULL);
u32 = now.tv_sec;
u32 = (u_int32_t)now.tv_sec;
memcpy(statp->_rnd, &u32, 4);
u32 = now.tv_usec;
memcpy(statp->_rnd + 4, &u32, 4);
u32 += now.tv_sec;
u32 += (u_int32_t)now.tv_sec;
memcpy(statp->_rnd + 8, &u32, 4);
u16 = getpid();
memcpy(statp->_rnd + 12, &u16, 2);

View File

@ -1,4 +1,4 @@
/* $NetBSD: res_mkquery.c,v 1.11 2009/04/12 17:07:17 christos Exp $ */
/* $NetBSD: res_mkquery.c,v 1.12 2009/04/12 19:43:37 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC")
@ -76,7 +76,7 @@
static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp";
#else
__RCSID("$NetBSD: res_mkquery.c,v 1.11 2009/04/12 17:07:17 christos Exp $");
__RCSID("$NetBSD: res_mkquery.c,v 1.12 2009/04/12 19:43:37 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -309,7 +309,7 @@ res_nopt_rdata(res_state statp,
ns_put16(len, cp);
cp += INT16SZ;
memcpy(cp, data, len);
memcpy(cp, data, (size_t)len);
cp += len;
len = cp - rdata;