diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am
index 45cdd03abaf439e11290beac331708f39a38fb10..11f9b25831fb660cd00bddbd329b72f279febf07 100644
--- a/asn1c/tests/Makefile.am
+++ b/asn1c/tests/Makefile.am
@@ -1,4 +1,6 @@
+AM_CFLAGS = @ADD_CFLAGS@
+
check_SCRIPTS = check-assembly.sh
TESTS_ENVIRONMENT= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index 17cc553a7188a4336e8019102d6ff49ac2bece79..b60721abeb042c429bac763ec9816bf41e6cdc6b 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -158,6 +158,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+AM_CFLAGS = @ADD_CFLAGS@
check_SCRIPTS = check-assembly.sh
TESTS_ENVIRONMENT = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
@CPLUSPLUS_FOUND_FALSE@TESTS = check-*.c
diff --git a/asn1c/tests/check-25.c b/asn1c/tests/check-25.c
index dad12ae109ffb6e752f8b2ef571baa53d2795ffe..5660d05642b81125380d8d3a55da57e714511266 100644
--- a/asn1c/tests/check-25.c
+++ b/asn1c/tests/check-25.c
@@ -168,9 +168,9 @@ partial_read(uint8_t *buf, size_t size) {
T_t t, *tp;
ber_dec_rval_t rval;
size_t i1, i2;
- uint8_t *buf1 = alloca(size);
- uint8_t *buf2 = alloca(size);
- uint8_t *buf3 = alloca(size);
+ uint8_t *tbuf1 = alloca(size);
+ uint8_t *tbuf2 = alloca(size);
+ uint8_t *tbuf3 = alloca(size);
fprintf(stderr, "\nPartial read sequence...\n");
@@ -190,44 +190,44 @@ partial_read(uint8_t *buf, size_t size) {
size_t size3 = size - size1 - size2;
fprintf(stderr, "\n%d:{%d, %d, %d}...\n",
- size, size1, size2, size3);
+ (int)size, (int)size1, (int)size2, (int)size3);
- memset(buf1, 0, size);
- memset(buf2, 0, size);
- memset(buf3, 0, size);
- memcpy(buf1, chunk1, size1);
- memcpy(buf2, chunk2, size2);
- memcpy(buf3, chunk3, size3);
+ memset(tbuf1, 0, size);
+ memset(tbuf2, 0, size);
+ memset(tbuf3, 0, size);
+ memcpy(tbuf1, chunk1, size1);
+ memcpy(tbuf2, chunk2, size2);
+ memcpy(tbuf3, chunk3, size3);
tp = memset(&t, 0, sizeof(t));
- fprintf(stderr, "=> Chunk 1 (%d):\n", size1);
+ fprintf(stderr, "=> Chunk 1 (%d):\n", (int)size1);
rval = ber_decode(&asn1_DEF_T, (void **)&tp,
- buf1, size1);
+ tbuf1, size1);
assert(rval.code == RC_WMORE);
assert(rval.consumed <= size1);
if(rval.consumed < size1) {
int leftover = size1 - rval.consumed;
- memcpy(buf2, buf1 + rval.consumed, leftover);
- memcpy(buf2 + leftover, chunk2, size2);
+ memcpy(tbuf2, tbuf1 + rval.consumed, leftover);
+ memcpy(tbuf2 + leftover, chunk2, size2);
size2 += leftover;
}
- fprintf(stderr, "=> Chunk 2 (%d):\n", size2);
+ fprintf(stderr, "=> Chunk 2 (%d):\n", (int)size2);
rval = ber_decode(&asn1_DEF_T, (void **)&tp,
- buf2, size2);
+ tbuf2, size2);
assert(rval.code == RC_WMORE);
assert(rval.consumed <= size2);
if(rval.consumed < size2) {
int leftover = size2 - rval.consumed;
- memcpy(buf3, buf2 + rval.consumed, leftover);
- memcpy(buf3 + leftover, chunk3, size3);
+ memcpy(tbuf3, tbuf2 + rval.consumed, leftover);
+ memcpy(tbuf3 + leftover, chunk3, size3);
size3 += leftover;
}
- fprintf(stderr, "=> Chunk 3 (%d):\n", size3);
+ fprintf(stderr, "=> Chunk 3 (%d):\n", (int)size3);
rval = ber_decode(&asn1_DEF_T, (void **)&tp,
- buf3, size3);
+ tbuf3, size3);
assert(rval.code == RC_OK);
assert(rval.consumed == size3);
diff --git a/asn1c/tests/check-31.c b/asn1c/tests/check-31.c
index 05380815e7191a35473a053a0b7a587fec2d4839..4b13f080d91593e534a80032c660f407569dbd7a 100644
--- a/asn1c/tests/check-31.c
+++ b/asn1c/tests/check-31.c
@@ -70,7 +70,7 @@ uint8_t buf1_reconstr[] = {
};
int buf_pos;
-int bytes_compare(const void *bufferp, size_t size, void *key) {
+static int bytes_compare(const void *bufferp, size_t size, void *key) {
const uint8_t *buffer = bufferp;
assert(buf_pos + size <= sizeof(buf1_reconstr));
diff --git a/asn1c/tests/check-35.c b/asn1c/tests/check-35.c
index 8fdaced0c94c83c414e3b75db1cb7019eedde476..42354947234ef0b19b5b9f232ae98851e77da116 100644
--- a/asn1c/tests/check-35.c
+++ b/asn1c/tests/check-35.c
@@ -120,7 +120,7 @@ check(T_t *tp, uint8_t *buf, int size, size_t consumed) {
tp = memset(tp, 0, sizeof(*tp));
- fprintf(stderr, "Buf %p (%d)\n", buf, size);
+ fprintf(stderr, "Buf %p (%d)\n", buf, (int)size);
rval = ber_decode(&asn1_DEF_T, (void **)&tp, buf, size);
fprintf(stderr, "Returned code %d, consumed %d\n",
(int)rval.code, (int)rval.consumed);
@@ -143,13 +143,14 @@ buf_fill(const void *buffer, size_t size, void *app_key) {
(void)app_key;
if(buf_pos + size > buf_size) {
- fprintf(stderr, "%d + %d > %d\n", buf_pos, (int)size, buf_size);
+ fprintf(stderr, "%d + %d > %d\n",
+ (int)buf_pos, (int)size, (int)buf_size);
return -1;
}
memcpy(buf + buf_pos, buffer, size);
buf_pos += size;
- fprintf(stderr, " written %d (%d)\n", (int)size, buf_pos);
+ fprintf(stderr, " written %d (%d)\n", (int)size, (int)buf_pos);
return 0;
}
@@ -212,7 +213,7 @@ partial_read(uint8_t *buf, size_t size) {
size_t size3 = size - size1 - size2;
fprintf(stderr, "\n%d:{%d, %d, %d}...\n",
- size, size1, size2, size3);
+ (int)size, (int)size1, (int)size2, (int)size3);
memset(buf1, 0, size);
memset(buf2, 0, size);
@@ -223,7 +224,7 @@ partial_read(uint8_t *buf, size_t size) {
tp = memset(&t, 0, sizeof(t));
- fprintf(stderr, "=> Chunk 1 (%d):\n", size1);
+ fprintf(stderr, "=> Chunk 1 (%d):\n", (int)size1);
rval = ber_decode(&asn1_DEF_T, (void **)&tp,
buf1, size1);
assert(rval.code == RC_WMORE);
@@ -235,7 +236,7 @@ partial_read(uint8_t *buf, size_t size) {
size2 += leftover;
}
- fprintf(stderr, "=> Chunk 2 (%d):\n", size2);
+ fprintf(stderr, "=> Chunk 2 (%d):\n", (int)size2);
rval = ber_decode(&asn1_DEF_T, (void **)&tp,
buf2, size2);
assert(rval.code == RC_WMORE);
@@ -247,7 +248,7 @@ partial_read(uint8_t *buf, size_t size) {
size3 += leftover;
}
- fprintf(stderr, "=> Chunk 3 (%d):\n", size3);
+ fprintf(stderr, "=> Chunk 3 (%d):\n", (int)size3);
rval = ber_decode(&asn1_DEF_T, (void **)&tp,
buf3, size3);
assert(rval.code == RC_OK);