add units to time, use configuration time api where appropriate, fixing Mantis #1875

[oweals/gnunet.git] / src / util / resolver_api.c

diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 913769ae1b5df8beff40f7827f6ae27e855585ff..03dc2ce89d1338cff86fe57b58206c302a408e11 100644 (file)
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -35,6 +35,8 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "resolver-api", __VA_ARGS__)
 
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "resolver-api", syscall)
+
 /**
  * Maximum supported length for a hostname
  */
@@ -292,8 +294,7 @@ no_resolve (const struct sockaddr *sa, socklen_t salen)
         inet_ntop (AF_INET, &((struct sockaddr_in *) sa)->sin_addr, inet4,
                    INET_ADDRSTRLEN))
     {
-      GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "resolver-api",
-                                "inet_ntop");
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
       return NULL;
     }
     ret = GNUNET_strdup (inet4);
@@ -305,8 +306,7 @@ no_resolve (const struct sockaddr *sa, socklen_t salen)
         inet_ntop (AF_INET6, &((struct sockaddr_in6 *) sa)->sin6_addr, inet6,
                    INET6_ADDRSTRLEN))
     {
-      GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "resolver-api",
-                                "inet_ntop");
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
       return NULL;
     }
     ret = GNUNET_strdup (inet6);
@@ -867,8 +867,8 @@ GNUNET_RESOLVER_local_fqdn_get ()
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
   {
-    GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                              "resolver-api", "gethostname");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                  "gethostname");
     return NULL;
   }
 #if DEBUG_RESOLVER
@@ -904,8 +904,8 @@ GNUNET_RESOLVER_hostname_resolve (int domain,
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
   {
-    GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                              "resolver-api", "gethostname");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                  "gethostname");
     return NULL;
   }
 #if DEBUG_RESOLVER