Do not print size of leaked blocks of memory (this causes a spurious regression test...

diff --git a/changelog b/changelog
index b2780f7d77c6153f367f5fd488031116637f0876..b1edb55ac5e17a1872dae75e1ed434d64a118201 100644 (file)
--- a/changelog
+++ b/changelog
@@ -3,8 +3,10 @@ adns (1.1.999.0.2); urgency=medium
   * Include reference to Peter Simons's Haskell bindings
     in README.html.
 
-  Patches from Bernd Eckenfels, the Debian maintainer:
+  Fixes from Bernd Eckenfels, the Debian maintainer:
   * Correct type of various printf arguments: ptrdiff_t != int.
+  * Do not print size of leaked blocks of memory (this causes
+    a spurious regression test failure).
 
  --
 

diff --git a/regress/case-arf-norm.err b/regress/case-arf-norm.err
index ab735427c964264f13a9d7d23ea6305855791a39..4a69d6c769c37be24ab4256e457fd73463859677 100644 (file)
--- a/regress/case-arf-norm.err
+++ b/regress/case-arf-norm.err
@@ -1,2 +1,2 @@
 adns debug: using nameserver 172.18.45.6
-adns test harness: memory leaked: 11(12) 24(76) 31(12) 43(48) 48(12) 60(72) 65(12) 77(72)
+adns test harness: memory leaked: 11 24 31 43 48 60 65 77

diff --git a/regress/hcommon.c b/regress/hcommon.c
index 3466ec98025648f29faff2be6bace386885734a7..ff984fecd1cd8d0924ce7f1323a92e9588e3211a 100644 (file)
--- a/regress/hcommon.c
+++ b/regress/hcommon.c
@@ -289,7 +289,7 @@ void Hexit(int rv) {
   if (mallocedlist.head) {
     fprintf(stderr,"adns test harness: memory leaked:");
     for (loopnode=mallocedlist.head; loopnode; loopnode=loopnode->next)
-      fprintf(stderr," %lu(%lu)",loopnode->count,(unsigned long)loopnode->sz);
+      fprintf(stderr," %lu",loopnode->count);
     putc('\n',stderr);
     if (ferror(stderr)) exit(-1);
   }

diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index 17f6955a84cc122c3593799a733dc2b1c3907284..05ce3f4a71a0536c7239b1b3207437d25661d6ae 100644 (file)
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -309,7 +309,7 @@ void Hexit(int rv) {
   if (mallocedlist.head) {
     fprintf(stderr,"adns test harness: memory leaked:");
     for (loopnode=mallocedlist.head; loopnode; loopnode=loopnode->next)
-      fprintf(stderr," %lu(%lu)",loopnode->count,(unsigned long)loopnode->sz);
+      fprintf(stderr," %lu",loopnode->count);
     putc('\n',stderr);
     if (ferror(stderr)) exit(-1);
   }