Module Name: src
Committed By: agc
Date: Thu Nov 22 00:38:45 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify: pgpsum.c
Log Message:
Fix some lint
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.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/libverify/pgpsum.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c:1.2 src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c:1.2 Tue Nov 20 05:26:26 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c Thu Nov 22 00:38:45 2012
@@ -36,6 +36,10 @@
#include "digest.h"
#include "pgpsum.h"
+#ifndef USE_ARG
+#define USE_ARG(x) /*LINTED*/(void)&(x)
+#endif
+
/* add the ascii armor line endings (except for last line) */
static size_t
don_armor(digest_t *hash, uint8_t *in, size_t insize, int doarmor)
@@ -103,7 +107,7 @@ already_armored(uint8_t *in, size_t insi
/* calculate the checksum for the data we have */
static int
-calcsum(uint8_t *out, size_t size, const char *name, uint8_t *mem, size_t cc, const uint8_t *hashed, size_t hashsize, int doarmor)
+calcsum(uint8_t *out, size_t size, uint8_t *mem, size_t cc, const uint8_t *hashed, size_t hashsize, int doarmor)
{
digest_t hash;
uint32_t len32;
@@ -111,6 +115,7 @@ calcsum(uint8_t *out, size_t size, const
uint8_t hashalg;
uint8_t trailer[6];
+ USE_ARG(size);
/* hashed data is non-null (previously checked) */
hashalg = hashed[3];
memcpy(&len16, &hashed[4], sizeof(len16));
@@ -122,7 +127,7 @@ calcsum(uint8_t *out, size_t size, const
#ifdef NETPGPV_DEBUG
writefile(mem, cc);
#endif
- digest_init(&hash, hashalg);
+ digest_init(&hash, (const unsigned)hashalg);
if (strchr("tw", doarmor) != NULL && !already_armored(mem, cc)) {
/* this took me ages to find - something causes gpg to truncate its input */
don_armor(&hash, mem, cc - 1, doarmor);
@@ -166,7 +171,7 @@ pgpv_digest_file(uint8_t *data, size_t s
warn("%s - can't mmap", name);
goto done;
}
- ret = calcsum(data, size, name, mem, cc, hashed, hashsize, doarmor);
+ ret = calcsum(data, size, mem, cc, hashed, hashsize, doarmor);
done:
if (data) {
munmap(mem, cc);
@@ -183,5 +188,5 @@ pgpv_digest_memory(uint8_t *data, size_t
fprintf(stderr, "no hashed data provided\n");
return 0;
}
- return calcsum(data, size, "[memory]", mem, cc, hashed, hashsize, doarmor);
+ return calcsum(data, size, mem, cc, hashed, hashsize, doarmor);
}
