Try to get rid of all warnings and errors in the travis tests

diff --git a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
index e58c468866f5a18abd1b1b924bcb31fdb42af35a..ed01b2681ce193d10bebabd943b69479dbcabce8 100644 (file)
--- a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
+++ b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
@@ -8,6 +8,7 @@ prefix  = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 mandir = @mandir@
+datarootdir = @datarootdir@
 
 CC = @CC@
 CFLAGS = @CFLAGS@

diff --git a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c
index b69bbba286a453cefb7ae4e7583eb5732f67c4ed..c80ea65970327e4faced667e780617a9b3a7222e 100644 (file)
--- a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c
+++ b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c
@@ -37,7 +37,7 @@ check_ldns_calc_keytag_part(const char *key_str, uint16_t expected_keytag)
 }
 
 ldns_status
-check_ldns_calc_keytag()
+check_ldns_calc_keytag(void)
 {
        const char *key_str;
        uint16_t expected_keytag;
@@ -74,7 +74,7 @@ check_ldns_calc_keytag()
 }
 
 ldns_status
-check_ldns_canonicalization()
+check_ldns_canonicalization(void)
 {
        const char rr_str1[] = "bla.nl. 1000 IN NS ns1.bla.nl.";
        const char rr_str2[] = "BLA.NL. 1000 IN NS NS1.BlA.Nl.";

diff --git a/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in b/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
index 0a84fbab23d798b507dbc341a14e3c1a5929c3b3..9875cdb7c5faefdc25bc53ca3917b65a540e2073 100644 (file)
--- a/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
+++ b/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
@@ -8,6 +8,7 @@ prefix  = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 mandir = @mandir@
+dataroot = @dataroot@
 
 CC = @CC@
 CFLAGS = @CFLAGS@

diff --git a/test/13-unit-tests-base.tpkg/13-unit-tests-base.c b/test/13-unit-tests-base.tpkg/13-unit-tests-base.c
index 01508dda0617fcc547011ce7473f4e19375d06eb..eb8572e05828bb7ce3b9ff886fb0b0c46c48ef8b 100644 (file)
--- a/test/13-unit-tests-base.tpkg/13-unit-tests-base.c
+++ b/test/13-unit-tests-base.tpkg/13-unit-tests-base.c
@@ -65,7 +65,8 @@ test_base64_decode(const char *str, const uint8_t *expect_data, size_t expect_da
 
        data_len = ldns_b64_pton_calculate_size(strlen(str));
        
-       data = malloc(data_len);
+       if(!(data = malloc(data_len)))
+               return -1;
        
        result = ldns_b64_pton(str, data, data_len);
        
@@ -102,7 +103,7 @@ test_base64_decode(const char *str, const uint8_t *expect_data, size_t expect_da
                        }
                }
        }
-       
+       free(data);
        return result;
 }
 
@@ -155,7 +156,8 @@ test_base32_decode(const char *str, const uint8_t *expect_data, size_t expect_da
 
        data_len = ldns_b32_pton_calculate_size(strlen(str))  +  10;
        
-       data = malloc(data_len);
+       if (!(data = malloc(data_len)))
+               return -1;
        
        result = ldns_b32_pton(str, strlen(str), data, data_len);
        
@@ -192,7 +194,7 @@ test_base32_decode(const char *str, const uint8_t *expect_data, size_t expect_da
                        }
                }
        }
-       
+       free(data);
        return result;
 }
 
@@ -247,7 +249,8 @@ test_base32_decode_extended_hex(const char *str, const uint8_t *expect_data, siz
 
        data_len = ldns_b32_pton_calculate_size(strlen(str)) + 10;
        
-       data = malloc(data_len);
+       if (!(data = malloc(data_len)))
+               return -1;
        
        result = ldns_b32_pton_extended_hex(str, strlen(str), data, data_len);
        
@@ -284,7 +287,7 @@ test_base32_decode_extended_hex(const char *str, const uint8_t *expect_data, siz
                        }
                }
        }
-       
+       free(data);
        return result;
 }
 

diff --git a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
index 030207c4fcbf5cd3b9a9cc07c572b630711bf0eb..aca0b0500bdcecb15b0d77833631017a77062ca6 100644 (file)
--- a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
+++ b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
@@ -8,6 +8,7 @@ prefix  = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 mandir = @mandir@
+dataroot = @dataroot@
 
 CC = @CC@
 CFLAGS = @CFLAGS@

diff --git a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.c b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.c
index 9937f0ef162366e7ea729b96d73a238d8cb5ac0e..2450f05aab2f4f303eaf32a7a351732439be5926 100644 (file)
--- a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.c
+++ b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.c
@@ -13,7 +13,7 @@ err(const ldns_rr_descriptor* desc, const char* why)
 }
 
 static int
-check_desc(const ldns_rr_descriptor* desc, int type)
+check_desc(const ldns_rr_descriptor* desc, ldns_rr_type type)
 {
        int i;
        int dcount = 0;
@@ -49,14 +49,14 @@ check_desc(const ldns_rr_descriptor* desc, int type)
 }
 
 static int
-check_descriptors()
+check_descriptors(void)
 {
-       int start = 0;
-       int end = LDNS_RDATA_FIELD_DESCRIPTORS_COMMON /* 250 */;
-       int i;
+       ldns_rr_type start = LDNS_RR_TYPE_FIRST;
+       ldns_rr_type end = LDNS_RDATA_FIELD_DESCRIPTORS_COMMON /* 250 */;
+       ldns_rr_type i;
        for(i=start; i<end; i++) {
                if(!check_desc(ldns_rr_descript(i), i)) {
-                       printf("Type %d failed\n", i);
+                       printf("Type %d failed\n", (int)i);
                        return 0;
                }
        }