enforsed compilation with -W -Werror

10 files changed, 48 insertions, 15 deletions

diff --git a/asn1c/tests/check-22.c b/asn1c/tests/check-22.c
index c80f9881..02227822 100644
--- a/asn1c/tests/check-22.c
+++ b/asn1c/tests/check-22.c
@@ -32,6 +32,9 @@ int buf2_pos;
 
 static int
 buf2_fill(const void *buffer, size_t size, void *app_key) {
+
+	(void)app_key;
+
 	if(buf2_pos + size > sizeof(buf2))
 		return -1;
 
@@ -42,7 +45,7 @@ buf2_fill(const void *buffer, size_t size, void *app_key) {
 }
 
 static void
-check(int is_ok, uint8_t *buf, int size, int consumed) {
+check(int is_ok, uint8_t *buf, int size, size_t consumed) {
 	T1_t t, *tp;
 	ber_dec_rval_t rval;
 	der_enc_rval_t erval;
@@ -57,7 +60,7 @@ check(int is_ok, uint8_t *buf, int size, int consumed) {
 
 	if(is_ok) {
 		assert(rval.code == RC_OK);
-		assert(rval.consumed == consumed);
+		assert(rval.consumed == (size_t)consumed);
 		assert(t.a.size == 2);
 		assert(t.b.present == b_PR_n);
 		assert(t.b.choice.n.size == 1);
@@ -73,7 +76,7 @@ check(int is_ok, uint8_t *buf, int size, int consumed) {
 				|| t.c.size != 1
 			);
 		}
-		assert(rval.consumed <= consumed);
+		assert(rval.consumed <= (size_t)consumed);
 		return;
 	}
 
@@ -89,7 +92,7 @@ check(int is_ok, uint8_t *buf, int size, int consumed) {
 		printf("%d != %d\n", (int)erval.encoded, (int)sizeof(buf1));
 	}
 	assert(erval.encoded == sizeof(buf1));
-	for(i = 0; i < sizeof(buf1); i++) {
+	for(i = 0; i < (ssize_t)sizeof(buf1); i++) {
 		if(buf1[i] != buf2[i]) {
 			fprintf(stderr, "Recreated buffer content mismatch:\n");
 			fprintf(stderr, "Byte %d, %x != %x (%d != %d)\n",
@@ -133,6 +136,9 @@ try_corrupt(uint8_t *buf, int size) {
 int
 main(int ac, char **av) {
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	check(1, buf1, sizeof(buf1), sizeof(buf1));
 	try_corrupt(buf1, sizeof(buf1));
 	check(1, buf1, sizeof(buf1) + 10, sizeof(buf1));
diff --git a/asn1c/tests/check-24.c b/asn1c/tests/check-24.c
index b74ca165..79de9115 100644
--- a/asn1c/tests/check-24.c
+++ b/asn1c/tests/check-24.c
@@ -34,7 +34,7 @@ uint8_t buf1[] = {
 };
 
 static void
-check(int is_ok, uint8_t *buf, int size, int consumed) {
+check(int is_ok, uint8_t *buf, int size, size_t consumed) {
 	T_t t, *tp;
 	ber_dec_rval_t rval;
 
@@ -87,6 +87,9 @@ try_corrupt(uint8_t *buf, int size) {
 int
 main(int ac, char **av) {
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	check(1, buf1, sizeof(buf1), sizeof(buf1));
 	try_corrupt(buf1, sizeof(buf1));
 
diff --git a/asn1c/tests/check-25.c b/asn1c/tests/check-25.c
index bd803da3..dad12ae1 100644
--- a/asn1c/tests/check-25.c
+++ b/asn1c/tests/check-25.c
@@ -82,7 +82,7 @@ uint8_t buf1[] = {
 };
 
 static void
-check(int is_ok, uint8_t *buf, int size, int consumed) {
+check(int is_ok, uint8_t *buf, int size, size_t consumed) {
 	T_t t, *tp;
 	ber_dec_rval_t rval;
 
@@ -164,10 +164,10 @@ try_corrupt(uint8_t *buf, int size, int allow_consume) {
 }
 
 static void
-partial_read(uint8_t *buf, int size) {
+partial_read(uint8_t *buf, size_t size) {
 	T_t t, *tp;
 	ber_dec_rval_t rval;
-	int i1, i2;
+	size_t i1, i2;
 	uint8_t *buf1 = alloca(size);
 	uint8_t *buf2 = alloca(size);
 	uint8_t *buf3 = alloca(size);
@@ -183,11 +183,11 @@ partial_read(uint8_t *buf, int size) {
 	for(i1 = 0; i1 < size; i1++) {
 		for(i2 = i1; i2 < size; i2++) {
 			uint8_t *chunk1 = buf;
-			int size1 = i1;
+			size_t size1 = i1;
 			uint8_t *chunk2 = buf + size1;
-			int size2 = i2 - i1;
+			size_t size2 = i2 - i1;
 			uint8_t *chunk3 = buf + size1 + size2;
-			int size3 = size - size1 - size2;
+			size_t size3 = size - size1 - size2;
 
 			fprintf(stderr, "\n%d:{%d, %d, %d}...\n",
 				size, size1, size2, size3);
@@ -239,6 +239,9 @@ partial_read(uint8_t *buf, int size) {
 int
 main(int ac, char **av) {
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	/* Check that the full buffer may be decoded normally */
 	check(1, buf1, sizeof(buf1), sizeof(buf1) - 3);
 
diff --git a/asn1c/tests/check-30.c b/asn1c/tests/check-30.c
index 9e5adf22..4ac52120 100644
--- a/asn1c/tests/check-30.c
+++ b/asn1c/tests/check-30.c
@@ -43,7 +43,7 @@ uint8_t buf2[] = {
 };
 
 static void
-check(int is_ok, uint8_t *buf, int size, int consumed) {
+check(int is_ok, uint8_t *buf, int size, size_t consumed) {
 	T_t t, *tp;
 	ber_dec_rval_t rval;
 
@@ -103,6 +103,9 @@ try_corrupt(uint8_t *buf, int size) {
 int
 main(int ac, char **av) {
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	fprintf(stderr, "Must succeed:\n");
 	check(1, buf1, sizeof(buf1) + 20, sizeof(buf1));
 
diff --git a/asn1c/tests/check-31.c b/asn1c/tests/check-31.c
index 53a90cba..cfebedcd 100644
--- a/asn1c/tests/check-31.c
+++ b/asn1c/tests/check-31.c
@@ -92,7 +92,7 @@ int bytes_compare(const void *bufferp, size_t size, void *key) {
 }
 
 static void
-check(int is_ok, uint8_t *buf, int size, int consumed) {
+check(int is_ok, uint8_t *buf, int size, size_t consumed) {
 	Forest_t t, *tp;
 	ber_dec_rval_t rval;
 
@@ -167,6 +167,9 @@ try_corrupt(uint8_t *buf, int size) {
 int
 main(int ac, char **av) {
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	check(1, buf1, sizeof(buf1), sizeof(buf1));
 	try_corrupt(buf1, sizeof(buf1));
 	check(1, buf1, sizeof(buf1) + 20, sizeof(buf1));
diff --git a/asn1c/tests/check-32.c b/asn1c/tests/check-32.c
index 3cb0fdac..49ad2d60 100644
--- a/asn1c/tests/check-32.c
+++ b/asn1c/tests/check-32.c
@@ -11,6 +11,9 @@ int
 main(int ac, char **av) {
 	Programming_t p;
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	memset(&p, 0, sizeof(p));
 
 	/*
diff --git a/asn1c/tests/check-33.c b/asn1c/tests/check-33.c
index 14f5377a..61638713 100644
--- a/asn1c/tests/check-33.c
+++ b/asn1c/tests/check-33.c
@@ -11,6 +11,9 @@ int
 main(int ac, char **av) {
 	T_t t;
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	memset(&t, 0, sizeof(t));
 
 	/*
diff --git a/asn1c/tests/check-35.c b/asn1c/tests/check-35.c
index 6b6c04d6..f29d877c 100644
--- a/asn1c/tests/check-35.c
+++ b/asn1c/tests/check-35.c
@@ -115,7 +115,7 @@ uint8_t buf2_reconstr[] = {
 };
 
 static void
-check(T_t *tp, uint8_t *buf, int size, int consumed) {
+check(T_t *tp, uint8_t *buf, int size, size_t consumed) {
 	ber_dec_rval_t rval;
 
 	tp = memset(tp, 0, sizeof(*tp));
@@ -260,6 +260,9 @@ int
 main(int ac, char **av) {
 	T_t t;
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	check(&t, buf1, sizeof(buf1) + 10, sizeof(buf1));
 	compare(&t, buf1_reconstr, sizeof(buf1_reconstr));
 	asn_fprint(stderr, &asn1_DEF_T, &t);
diff --git a/asn1c/tests/check-41.c b/asn1c/tests/check-41.c
index c2238cf5..09a9d62a 100644
--- a/asn1c/tests/check-41.c
+++ b/asn1c/tests/check-41.c
@@ -130,7 +130,7 @@ uint8_t buf2_reconstr[] = {
 
 
 static void
-check(T_t *tp, uint8_t *buf, int size, int consumed) {
+check(T_t *tp, uint8_t *buf, int size, size_t consumed) {
 	ber_dec_rval_t rval;
 
 	tp = memset(tp, 0, sizeof(*tp));
@@ -278,6 +278,9 @@ int
 main(int ac, char **av) {
 	T_t t;
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	/* Check exact buf0 */
 	check(&t, buf0, sizeof(buf0), sizeof(buf0));
 	compare(&t, buf0_reconstr, sizeof(buf0_reconstr));
diff --git a/asn1c/tests/check-43.c b/asn1c/tests/check-43.c
index e44218d8..c906f64d 100644
--- a/asn1c/tests/check-43.c
+++ b/asn1c/tests/check-43.c
@@ -13,6 +13,9 @@ main(int ac, char **av) {
 	Test_structure_1_t ts1;
 	Sets_t s1;
 
+	(void)ac;	/* Unused argument */
+	(void)av;	/* Unused argument */
+
 	memset(&ts1, 0, sizeof(ts1));
 	memset(&s1, 0, sizeof(s1));