Module Name: src
Committed By: christos
Date: Fri Nov 16 02:16:38 UTC 2012
Modified Files:
src/lib/libresolv: dst_api.c hmac_link.c ns_verify.c
Log Message:
fix lint
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libresolv/hmac_link.c \
src/lib/libresolv/ns_verify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libresolv/dst_api.c
diff -u src/lib/libresolv/dst_api.c:1.2 src/lib/libresolv/dst_api.c:1.3
--- src/lib/libresolv/dst_api.c:1.2 Thu Nov 15 21:10:26 2012
+++ src/lib/libresolv/dst_api.c Thu Nov 15 21:16:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_api.c,v 1.2 2012/11/16 02:10:26 joerg Exp $ */
+/* $NetBSD: dst_api.c,v 1.3 2012/11/16 02:16:38 christos Exp $ */
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -40,7 +40,7 @@
#if 0
static const char rcsid[] = "Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp ";
#else
-__RCSID("$NetBSD: dst_api.c,v 1.2 2012/11/16 02:10:26 joerg Exp $");
+__RCSID("$NetBSD: dst_api.c,v 1.3 2012/11/16 02:16:38 christos Exp $");
#endif
@@ -437,10 +437,11 @@ dst_s_write_private_key(const DST_KEY *k
/* Do not overwrite an existing file */
if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
ssize_t nn;
- /*LINTED*/
- if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
+ nn = fwrite(encoded_block, 1, len, fp);
+ if (nn != len) {
EREPORT(("%s: Write failure on %s %d != %zd"
" errno=%d\n", __func__, file, len, nn, errno));
+
fclose(fp);
return (-5);
}
Index: src/lib/libresolv/hmac_link.c
diff -u src/lib/libresolv/hmac_link.c:1.1 src/lib/libresolv/hmac_link.c:1.2
--- src/lib/libresolv/hmac_link.c:1.1 Thu Nov 15 13:48:48 2012
+++ src/lib/libresolv/hmac_link.c Thu Nov 15 21:16:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hmac_link.c,v 1.1 2012/11/15 18:48:48 christos Exp $ */
+/* $NetBSD: hmac_link.c,v 1.2 2012/11/16 02:16:38 christos Exp $ */
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -20,7 +20,7 @@
#if 0
static const char rcsid[] = "Header: /proj/cvs/prod/libbind/dst/hmac_link.c,v 1.8 2007/09/24 17:18:25 each Exp ";
#else
-__RCSID("$NetBSD: hmac_link.c,v 1.1 2012/11/15 18:48:48 christos Exp $");
+__RCSID("$NetBSD: hmac_link.c,v 1.2 2012/11/16 02:16:38 christos Exp $");
#endif
/*%
@@ -103,7 +103,7 @@ dst_hmac_md5_sign(const int mode, DST_KE
}
if ((mode & SIG_MODE_UPDATE) && (data && len > 0))
- MD5Update(ctx, data, len);
+ MD5Update(ctx, data, (unsigned int)len);
if (mode & SIG_MODE_FINAL) {
if (signature == NULL || sig_len < MD5_LEN)
Index: src/lib/libresolv/ns_verify.c
diff -u src/lib/libresolv/ns_verify.c:1.1 src/lib/libresolv/ns_verify.c:1.2
--- src/lib/libresolv/ns_verify.c:1.1 Thu Nov 15 13:48:48 2012
+++ src/lib/libresolv/ns_verify.c Thu Nov 15 21:16:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_verify.c,v 1.1 2012/11/15 18:48:48 christos Exp $ */
+/* $NetBSD: ns_verify.c,v 1.2 2012/11/16 02:16:38 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -461,7 +461,7 @@ ns_verify_tcp(u_char *msg, int *msglen,
buf, (int)(cp2 - buf), NULL, 0);
n = dst_verify_data(SIG_MODE_FINAL, state->key, &state->ctx, NULL, 0,
- sigstart, sigfieldlen);
+ sigstart, (int)sigfieldlen);
if (n < 0)
return (-ns_r_badsig);
