generate constraints differently to avoid warnings
diff --git a/tests/tests-c-compiler/check-src/check-135.-gen-OER.c b/tests/tests-c-compiler/check-src/check-135.-gen-OER.c
index 6673a49..9060a6b 100644
--- a/tests/tests-c-compiler/check-src/check-135.-gen-OER.c
+++ b/tests/tests-c-compiler/check-src/check-135.-gen-OER.c
@@ -27,9 +27,9 @@
oer_decode(0, &asn_DEF_T, (void **)&decoded, tmpbuf, er.encoded);
assert(dr.code == RC_OK);
- if(dr.consumed != er.encoded) {
+ if((ssize_t)dr.consumed != er.encoded) {
ASN_DEBUG("Consumed %zu, expected %zu", dr.consumed, er.encoded);
- assert(dr.consumed == er.encoded);
+ assert((ssize_t)dr.consumed == er.encoded);
}
if(XEQ_SUCCESS != xer_equivalent(&asn_DEF_T, &source, decoded, stderr)) {
diff --git a/tests/tests-c-compiler/check-src/check-148.c b/tests/tests-c-compiler/check-src/check-148.c
index 94afdcd..c6ba07a 100644
--- a/tests/tests-c-compiler/check-src/check-148.c
+++ b/tests/tests-c-compiler/check-src/check-148.c
@@ -100,24 +100,20 @@
static void
compare_encoding(asn_enc_rval_t *erval, uint8_t *expected, size_t expected_size,
uint8_t *actual) {
- int i;
assert(erval->encoded != -1);
- if(erval->encoded != expected_size) {
+ if((size_t)erval->encoded != expected_size) {
printf("%d != %d\n", (int)erval->encoded, (int)expected_size);
+ assert((size_t)erval->encoded == expected_size);
}
- assert(erval->encoded == (ssize_t)expected_size);
- for(i = 0; i < expected_size; i++) {
- if(expected[i] != actual[i]) {
- fprintf(stderr, "Recreated buffer content mismatch:\n");
- fprintf(stderr, "Byte %d, %x != %x (%d != %d)\n",
- i,
- expected[i], actual[i],
- expected[i], actual[i]
- );
- }
- assert(expected[i] == actual[i]);
- }
+ for(size_t i = 0; i < expected_size; i++) {
+ if(expected[i] != actual[i]) {
+ fprintf(stderr, "Recreated buffer content mismatch:\n");
+ fprintf(stderr, "Byte %zu, %x != %x (%d != %d)\n", i, expected[i],
+ actual[i], expected[i], actual[i]);
+ }
+ assert(expected[i] == actual[i]);
+ }
}
static void
diff --git a/tests/tests-c-compiler/check-src/check-41.c b/tests/tests-c-compiler/check-src/check-41.c
index 483229e..39bbe3c 100644
--- a/tests/tests-c-compiler/check-src/check-41.c
+++ b/tests/tests-c-compiler/check-src/check-41.c
@@ -90,9 +90,8 @@
}
static void
-compare(T_t *tp, uint8_t *cmp_buf, int cmp_buf_size) {
+compare(T_t *tp, uint8_t *cmp_buf, size_t cmp_buf_size) {
asn_enc_rval_t erval;
- int i;
buf_size = cmp_buf_size + 100;
uint8_t scratch[buf_size];
@@ -104,14 +103,14 @@
*/
erval = der_encode(&asn_DEF_T, tp, buf_fill, 0);
assert(erval.encoded != -1);
- if(erval.encoded != cmp_buf_size) {
+ if((size_t)erval.encoded != cmp_buf_size) {
printf("%zd != %zd\n", erval.encoded, cmp_buf_size);
- }
- assert(erval.encoded == cmp_buf_size);
- for(i = 0; i < cmp_buf_size; i++) {
+ assert((size_t)erval.encoded == cmp_buf_size);
+ }
+ for(size_t i = 0; i < cmp_buf_size; i++) {
if(buf[i] != cmp_buf[i]) {
fprintf(stderr, "Recreated buffer content mismatch:\n");
- fprintf(stderr, "Byte %d, %x != %x (%d != %d)\n",
+ fprintf(stderr, "Byte %zd, %x != %x (%d != %d)\n",
i,
buf[i], cmp_buf[i],
buf[i], cmp_buf[i]
diff --git a/tests/tests-c-compiler/check-src/check-42.c b/tests/tests-c-compiler/check-src/check-42.c
index 9ff2866..4f11f61 100644
--- a/tests/tests-c-compiler/check-src/check-42.c
+++ b/tests/tests-c-compiler/check-src/check-42.c
@@ -7,6 +7,18 @@
#include <LogLine.h>
+#ifdef ENABLE_LIBFUZZER
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+ LogLine_t *lp = 0;
+ (void)ber_decode(0, &asn_DEF_LogLine, (void **)&lp, Data, Size);
+ ASN_STRUCT_FREE(asn_DEF_LogLine, lp);
+ return 0;
+}
+
+#else
+
uint8_t buf0[] = {
48, /* LogLine SEQUENCE */
24, /* L */
@@ -126,17 +138,6 @@
return;
}
-#ifdef ENABLE_LIBFUZZER
-
-int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
- LogLine_t *lp = 0;
- (void)ber_decode(0, &asn_DEF_LogLine, (void **)&lp, Data, Size);
- ASN_STRUCT_FREE(asn_DEF_LogLine, lp);
- return 0;
-}
-
-#else
-
int
main(int ac, char **av) {
LogLine_t t;
diff --git a/tests/tests-c-compiler/check-src/check-70.-fwide-types.c b/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
index 7891069..4391b19 100644
--- a/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
+++ b/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
@@ -25,6 +25,20 @@
#define SRCDIR_S STRINGIFY_MACRO(SRCDIR)
#endif
+#ifdef ENABLE_LIBFUZZER
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+ PDU_t *st = 0;
+ asn_dec_rval_t rval;
+ rval = asn_decode(0, ATS_BASIC_XER, &asn_DEF_PDU, (void **)&st, Data, Size);
+ assert(rval.consumed <= Size);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
+ return 0;
+}
+
+#else
+
enum expectation {
EXP_OK, /* Encoding/decoding must succeed */
EXP_CXER_EXACT, /* Encoding/decoding using CXER must be exact */
@@ -278,19 +292,6 @@
return 1;
}
-#ifdef ENABLE_LIBFUZZER
-
-int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
- PDU_t *st = 0;
- asn_dec_rval_t rval;
- rval = asn_decode(0, ATS_BASIC_XER, &asn_DEF_PDU, (void **)&st, Data, Size);
- assert(rval.consumed <= Size);
- ASN_STRUCT_FREE(asn_DEF_PDU, st);
- return 0;
-}
-
-#else
-
int
main() {
DIR *dir;
diff --git a/tests/tests-c-compiler/check-src/check-70.c b/tests/tests-c-compiler/check-src/check-70.c
index 821b3d6..cb5d520 100644
--- a/tests/tests-c-compiler/check-src/check-70.c
+++ b/tests/tests-c-compiler/check-src/check-70.c
@@ -25,6 +25,20 @@
#define SRCDIR_S STRINGIFY_MACRO(SRCDIR)
#endif
+#ifdef ENABLE_LIBFUZZER
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+ PDU_t *st = 0;
+ asn_dec_rval_t rval;
+ rval = asn_decode(0, ATS_BASIC_XER, &asn_DEF_PDU, (void **)&st, Data, Size);
+ assert(rval.consumed <= Size);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
+ return 0;
+}
+
+#else
+
enum expectation {
EXP_OK, /* Encoding/decoding must succeed */
EXP_BROKEN, /* Decoding must fail */
@@ -257,19 +271,6 @@
return 1;
}
-#ifdef ENABLE_LIBFUZZER
-
-int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
- PDU_t *st = 0;
- asn_dec_rval_t rval;
- rval = asn_decode(0, ATS_BASIC_XER, &asn_DEF_PDU, (void **)&st, Data, Size);
- assert(rval.consumed <= Size);
- ASN_STRUCT_FREE(asn_DEF_PDU, st);
- return 0;
-}
-
-#else
-
int
main() {
DIR *dir;
diff --git a/tests/tests-c-compiler/check-src/check64-136.-gen-OER.c b/tests/tests-c-compiler/check-src/check64-136.-gen-OER.c
index 6b17a7b..866fd71 100644
--- a/tests/tests-c-compiler/check-src/check64-136.-gen-OER.c
+++ b/tests/tests-c-compiler/check-src/check64-136.-gen-OER.c
@@ -30,9 +30,9 @@
oer_decode(0, &asn_DEF_T, (void **)&decoded, tmpbuf, er.encoded);
assert(dr.code == RC_OK);
- if(dr.consumed != er.encoded) {
- ASN_DEBUG("Consumed %zu, expected %zu", dr.consumed, er.encoded);
- assert(dr.consumed == er.encoded);
+ if((ssize_t)dr.consumed != er.encoded) {
+ ASN_DEBUG("Consumed %zd, expected %zu", dr.consumed, er.encoded);
+ assert((ssize_t)dr.consumed == er.encoded);
}
if(XEQ_SUCCESS != xer_equivalent(&asn_DEF_T, &source, decoded, stderr)) {