Module Name: src
Committed By: agc
Date: Tue Apr 28 00:41:40 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: packet-parse.c reader.c
Log Message:
Clean up minor pieces of lint
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.2 Sat Apr 25 01:29:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Tue Apr 28 00:41:40 2009
@@ -467,7 +467,7 @@
unsigned n;
assert(length <= 4);
- assert(/*CONSTCOND*/sizeof(*dest) >= sizeof(uint32_t));
+ assert(/*CONSTCOND*/sizeof(*dest) >= 4);
if (!limited_read(c, length, region, pinfo))
return 0;
Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.2 Sat Apr 25 01:29:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Tue Apr 28 00:41:40 2009
@@ -2098,9 +2098,9 @@
char *cmem = mem->mem;
int n;
- (void)&errors;
- n = MIN(length, (int)(mem->size - mem->offset));
+ OPS_USED(errors);
OPS_USED(cbinfo);
+ n = MIN(length, (int)(mem->size - mem->offset));
if (n > 0) {
(void) memcpy(dest, &cmem[(int)mem->offset], (unsigned)n);
mem->offset += n;
