* adnstest converts some errno values to EFOOBAR: all of the ones

    mentioned in adns.h, at least.  This makes the regression test
    more portable (fixes problem noticed by Bernd Eckenfels).

diff --git a/changelog b/changelog
index cf9069854c9d3685c176803e1d4f4851dc72d28f..6467c9e2fbca06c7d9acafe0a665c7c4a810779c 100644 (file)
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ adns (1.1.999.0.2); urgency=medium
     make a libadns.so.1 -> libadns.so.1.<minor> link.  (Suggestions
     and patch from Nix of esperi.org.uk.)
   * Update MINOR to 2 because of adns_init_logfn.
     make a libadns.so.1 -> libadns.so.1.<minor> link.  (Suggestions
     and patch from Nix of esperi.org.uk.)
   * Update MINOR to 2 because of adns_init_logfn.

+  * adnstest converts some errno values to EFOOBAR: all of the ones
+    mentioned in adns.h, at least.  This makes the regression test
+    more portable (fixes problem noticed by Bernd Eckenfels).

 
   Fixes from or suggested by Bernd Eckenfels, the Debian maintainer:
   * Correct type of various printf arguments: ptrdiff_t != int.
 
   Fixes from or suggested by Bernd Eckenfels, the Debian maintainer:
   * Correct type of various printf arguments: ptrdiff_t != int.

diff --git a/client/adnstest.c b/client/adnstest.c
index e99f5a1ac4967f42982787dca5b041f5f8b02501..36d7ffe781f1100daf01be348dd8be6f9b935578 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -77,7 +77,18 @@ static void failure_status(const char *what, adns_status st) {
 
 static void failure_errno(const char *what, int errnoval) NONRETURNING;
 static void failure_errno(const char *what, int errnoval) {
 
 static void failure_errno(const char *what, int errnoval) NONRETURNING;
 static void failure_errno(const char *what, int errnoval) {

-  fprintf(stderr,"adns failure: %s: errno=%d\n",what,errnoval);
+  switch (errnoval) {
+#define CE(e) \
+  case e: fprintf(stderr,"adns failure: %s: errno=" #e "\n",what); break
+  CE(EINVAL);
+  CE(EINTR);
+  CE(ESRCH);
+  CE(EAGAIN);
+  CE(ENOSYS);
+  CE(ERANGE);
+#undef CE
+  default: fprintf(stderr,"adns failure: %s: errno=%d\n",what,errnoval); break;
+  }

   quitnow(2);
 }
 
   quitnow(2);
 }
 

diff --git a/regress/case-ndotsbad.err b/regress/case-ndotsbad.err
index 700201a72b9479ebae207cc8585f6070add02cab..31d3eabfcc6b3341a22a1e09ebc225a771145764 100644 (file)
--- a/regress/case-ndotsbad.err
+++ b/regress/case-ndotsbad.err
@@ -1 +1 @@
-adns failure: init: errno=22
+adns failure: init: errno=EINVAL