fix warningsHEAD1.0.1master

Signed-off-by: Mattias Andrée <m@maandree.se>

3 files changed, 17 insertions, 10 deletions

diff --git a/bsum.c b/bsum.c
index 80bc203..775715b 100644
--- a/bsum.c
+++ b/bsum.c
@@ -12,7 +12,7 @@ static int flag_upper = 0;
 static int flag_hex = 0;
 static int flag_zero = 0;
 static int length;
-static void *salt = NULL;
+static void *flag_salt = NULL;
 
 static void
 usage(void)
@@ -85,7 +85,7 @@ hash_fd_blake(int fd, const char *fname, int decode_hex, unsigned char hash[], v
 	req = get_buf_size_func(len, 0, NULL);
 	if (req > size)
 		buf = erealloc(buf, size);
-	libblake_blake224_digest(state, buf, len, 0, NULL, hash);
+	digest_func(state, buf, len, 0, NULL, hash);
 	free(buf);
 	return 0;
 }
@@ -140,13 +140,13 @@ hash_fd(int fd, const char *fname, int decode_hex, unsigned char hash[])
 	int ret;
 
 	if (length == 224)
-		ret = hash_fd_blake224(fd, fname, decode_hex, hash, salt);
+		ret = hash_fd_blake224(fd, fname, decode_hex, hash, flag_salt);
 	else if (length == 256)
-		ret = hash_fd_blake256(fd, fname, decode_hex, hash, salt);
+		ret = hash_fd_blake256(fd, fname, decode_hex, hash, flag_salt);
 	else if (length == 384)
-		ret = hash_fd_blake384(fd, fname, decode_hex, hash, salt);
+		ret = hash_fd_blake384(fd, fname, decode_hex, hash, flag_salt);
 	else if (length == 512)
-		ret = hash_fd_blake512(fd, fname, decode_hex, hash, salt);
+		ret = hash_fd_blake512(fd, fname, decode_hex, hash, flag_salt);
 	else
 		abort();
 
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
 
 	if (salt_str) {
 		parse_salt(salt_buf, salt_str, length <= 256 ? 16 : 32);
-		salt = salt_buf;
+		flag_salt = salt_buf;
 	}
 
 	newline = flag_zero ? '\0' : '\n';
diff --git a/common.c b/common.c
index 45a764b..82ad938 100644
--- a/common.c
+++ b/common.c
@@ -239,7 +239,7 @@ parse_salt_or_pepper(uint_least8_t *out, const char *s, size_t required_length,
 			goto not_hexadecimal;
 
 		out[i] = (uint_least8_t)((((s[0] & 15) + (s[0] > '9' ? 9 : 0)) << 4) |
-		                           (s[1] & 15) + (s[1] > '9' ? 9 : 0));
+		                          ((s[1] & 15) + (s[1] > '9' ? 9 : 0)));
 	}
 
 	if (*s)
@@ -291,7 +291,7 @@ parse_key(uint_least8_t *key, const char *s, size_t maximum_length)
 			goto not_hexadecimal;
 
 		key[i] = (uint_least8_t)((((s[0] & 15) + (s[0] > '9' ? 9 : 0)) << 4) |
-		                           (s[1] & 15) + (s[1] > '9' ? 9 : 0));
+		                          ((s[1] & 15) + (s[1] > '9' ? 9 : 0)));
 	}
 
 	if (*s)
diff --git a/test.c b/test.c
index 7908dd4..21c0f27 100644
--- a/test.c
+++ b/test.c
@@ -214,7 +214,14 @@ hashx(unsigned char **msg, size_t msglen, size_t *msgsize,
 	ssize_t r;
 	int status;
 
+	(void) msgsize;
+	(void) testno;
+	(void) test_lineno;
+	(void) path;
+
 	if (keylen) {
+		(void) key;
+		(void) keysize;
 		/* KEY OPTION IS NOT YET IMPLEMENTED */
 		*outlen = hashlen;
 		if (*outsize < hashlen) {
@@ -248,7 +255,7 @@ hashx(unsigned char **msg, size_t msglen, size_t *msgsize,
 				ERROR("Internal test error: %s\n", strerror(errno));
 			close(output_pipe[1]);
 		}
-		execv(argv[0], (void *const)argv);
+		execv(argv[0], *(char ***)(void *)&argv);
 		ERROR("Internal test error: %s\n", strerror(errno));
 		/* $covered}$ */