Some pedantic warning fixes + tpkg test fixes

diff --git a/.travis.yml b/.travis.yml
index 380857ec57fad160aa846b078694c7994fa58599..d6dae0be8727d1ed92da1eed22f87e0889bdaed8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ addons:
       - lcov
       - doxygen
       - graphviz
+      - indent
 matrix:
   include:
     - os: linux

diff --git a/contrib/python/ldns_rr.i b/contrib/python/ldns_rr.i
index 726c6cd902afb4f0ae13948ec6e4e62eb7a34a64..e5cf1c2490204994874c1de9b02ac08f79675712 100644 (file)
--- a/contrib/python/ldns_rr.i
+++ b/contrib/python/ldns_rr.i
@@ -456,7 +456,7 @@
 %{
   void _ldns_rr_set_owner(ldns_rr *rr, ldns_rdf *rdf)
   {
-    return ldns_rr_set_owner(rr, ldns_rdf_clone(rdf));
+    ldns_rr_set_owner(rr, ldns_rdf_clone(rdf));
   }
 %}
 

diff --git a/duration.c b/duration.c
index 638f6c8c6dec816de0a4c1aba0a61d3aea5902a4..bcd163651f06d54030b52a804fc5e5aaf71fa900 100644 (file)
--- a/duration.c
+++ b/duration.c
@@ -285,7 +285,7 @@ ldns_duration2string(const ldns_duration_type* duration)
         str = strncat(str, num, count+2);
     }
     if (T) {
-        str = strncat(str, "T", 1);
+        str = strcat(str, "T");
     }
     if (duration->hours > 0) {
         count = digits_in_number(duration->hours);

diff --git a/test/01-compile.tpkg/01-compile.test b/test/01-compile.tpkg/01-compile.test
index 2e56b7ff26dc2e070d1ad8602a934f3bebc73441..a4d1f21ef31d4cdbc132a1d45681e9283130c860 100644 (file)
--- a/test/01-compile.tpkg/01-compile.test
+++ b/test/01-compile.tpkg/01-compile.test
@@ -55,7 +55,7 @@ fi
         || ./configure  --enable-sha2 --disable-gost --with-drill --with-examples --disable-dane-ta-usage \
         || ./configure --disable-sha2 --disable-gost --with-drill --with-examples --disable-dane-ta-usage
 
-        ) && $mk && rmdir -f python-site
+        ) && $mk && (rmdir python-site || true)
       )
    )