converting to GNUNET_LOG_from*

1 files changed, 134 insertions, 133 deletions

diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 4e248aa72..24c71b41f 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -46,12 +46,13 @@ check_hostname (void *cls, const struct sockaddr *sa, socklen_t salen)
   int *ok = cls;
 
   if (salen == 0)
-  {
-    (*ok) &= ~8;
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Got IP address `%s' for our host.\n"),
-              GNUNET_a2s (sa, salen));
+    {
+      (*ok) &= ~8;
+      return;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              _("Got IP address `%s' for our host.\n"), GNUNET_a2s (sa,
+                                                                    salen));
 }
 
 
@@ -63,21 +64,21 @@ check_localhost_num (void *cls, const char *hostname)
   if (hostname == NULL)
     return;
   if (0 == strcmp (hostname, "127.0.0.1"))
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct hostname `%s'.\n",
-                hostname);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received correct hostname `%s'.\n", hostname);
 #endif
-    (*ok) &= ~4;
-  }
+      (*ok) &= ~4;
+    }
   else
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received invalid hostname `%s'.\n",
-                hostname);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received invalid hostname `%s'.\n", hostname);
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 }
 
 
@@ -89,19 +90,19 @@ check_localhost (void *cls, const char *hostname)
   if (hostname == NULL)
     return;
   if (0 == strcmp (hostname, "localhost"))
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct hostname `%s'.\n",
-                hostname);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received correct hostname `%s'.\n", hostname);
 #endif
-    (*ok) &= ~2;
-  }
+      (*ok) &= ~2;
+    }
   else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Received unexpected hostname `%s', expected `localhost' (this could be OK).\n",
-                hostname);
-  }
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Received unexpected hostname `%s', expected `localhost' (this could be OK).\n",
+                  hostname);
+    }
 }
 
 static void
@@ -114,19 +115,19 @@ check_127 (void *cls, const struct sockaddr *sa, socklen_t salen)
     return;
   GNUNET_assert (sizeof (struct sockaddr_in) == salen);
   if (sai->sin_addr.s_addr == htonl (INADDR_LOOPBACK))
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct address.\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct address.\n");
 #endif
-    (*ok) &= ~1;
-  }
+      (*ok) &= ~1;
+    }
   else
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received incorrect address.\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received incorrect address.\n");
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 }
 
 static void
@@ -138,32 +139,32 @@ check_local_fqdn (void *cls, const char *gnunet_fqdn)
   char hostname[GNUNET_OS_get_hostname_max_length () + 1];
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                         "gethostname");
-    return;
-  }
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                           "gethostname");
+      return;
+    }
 #if DEBUG_RESOLVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Resolving our FQDN `%s'\n"),
-              hostname);
+              hostname);
 #endif
   host = gethostbyname (hostname);
   if (NULL == host)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Could not resolve our FQDN : %s %u\n"), hstrerror (h_errno),
-                h_errno);
-    return;
-  }
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _("Could not resolve our FQDN : %s %u\n"),
+                  hstrerror (h_errno), h_errno);
+      return;
+    }
 
   GNUNET_assert (0 != host);
 
   result = strcmp (host->h_name, gnunet_fqdn);
   if (0 != result)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Local resolved and resolver resolved fqdns are not equal\n");
-  }
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Local resolved and resolver resolved fqdns are not equal\n");
+    }
   GNUNET_assert (0 == result);
 }
 
@@ -180,21 +181,21 @@ check_rootserver_ip (void *cls, const struct sockaddr *sa, socklen_t salen)
   GNUNET_assert (sizeof (struct sockaddr_in) == salen);
 
   if (0 == strcmp (inet_ntoa (sai->sin_addr), ROOTSERVER_IP))
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received correct rootserver ip address.\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received correct rootserver ip address.\n");
 #endif
-    (*ok) &= ~1;
-  }
+      (*ok) &= ~1;
+    }
   else
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received incorrect rootserver ip address.\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received incorrect rootserver ip address.\n");
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 }
 
 static void
@@ -206,21 +207,21 @@ check_rootserver_name (void *cls, const char *hostname)
     return;
 
   if (0 == strcmp (hostname, ROOTSERVER_NAME))
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received correct rootserver hostname `%s'.\n", hostname);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received correct rootserver hostname `%s'.\n", hostname);
 #endif
-    (*ok) &= ~2;
-  }
+      (*ok) &= ~2;
+    }
   else
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received invalid rootserver hostname `%s'.\n", hostname);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received invalid rootserver hostname `%s'.\n", hostname);
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 }
 
 static void
@@ -230,7 +231,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   int *ok = cls;
   struct sockaddr_in sa;
   struct GNUNET_TIME_Relative timeout =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
+    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
   int count_ips = 0;
   char *own_fqdn;
 
@@ -257,50 +258,50 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   rootserver = gethostbyname (rootserver_name);
   if (rootserver == NULL)
-  {
-    /* Error: resolving ip addresses does not work */
+    {
+      /* Error: resolving ip addresses does not work */
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("gethostbyname() could not lookup IP address: %s\n"),
-                hstrerror (h_errno));
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  _("gethostbyname() could not lookup IP address: %s\n"),
+                  hstrerror (h_errno));
 #endif
-    fprintf (stderr,
-             "System seems to be off-line, will not run all DNS tests\n");
-    *ok = 0;                    /* mark test as passing anyway */
-    return;
-  }
+      fprintf (stderr,
+               "System seems to be off-line, will not run all DNS tests\n");
+      *ok = 0;                  /* mark test as passing anyway */
+      return;
+    }
 
   /* Counting returned IP addresses */
   while (rootserver->h_addr_list[count_ips] != NULL)
     count_ips++;
   if (count_ips > 1)
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "IP received range for root name server, but a root name server has only 1 IP\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "IP received range for root name server, but a root name server has only 1 IP\n");
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 
   /* Comparing to resolved address to the address the root name server should have */
   if (strcmp
       (inet_ntoa (*(struct in_addr *) rootserver->h_addr_list[0]),
        ROOTSERVER_IP) != 0)
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "IP received and IP for root name server differ\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "IP received and IP for root name server differ\n");
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 #if DEBUG_RESOLVER
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "System's own forward name resolution is working\n");
+              "System's own forward name resolution is working\n");
 #endif
 
   /* Resolve the same using GNUNET */
   GNUNET_RESOLVER_ip_get (ROOTSERVER_NAME, AF_INET, timeout,
-                          &check_rootserver_ip, cls);
+                          &check_rootserver_ip, cls);
 
   /*
    * Success: forward lookups work as expected
@@ -311,41 +312,41 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   rootserver->h_name = "";
   if (1 != inet_pton (AF_INET, ROOTSERVER_IP, &rootserver_addr))
-  {
+    {
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not transform root name server IP address\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Could not transform root name server IP address\n");
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
 
   rootserver =
-      gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET);
+    gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET);
   if (rootserver == NULL)
-  {
-    /* Error: resolving IP addresses does not work */
+    {
+      /* Error: resolving IP addresses does not work */
 #if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("gethostbyaddr() could not lookup hostname: %s\n"),
-                hstrerror (h_errno));
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  _("gethostbyaddr() could not lookup hostname: %s\n"),
+                  hstrerror (h_errno));
 #endif
-    GNUNET_break (0);
-  }
+      GNUNET_break (0);
+    }
   else
-  {
-    if (0 != strcmp (rootserver->h_name, ROOTSERVER_NAME))
     {
+      if (0 != strcmp (rootserver->h_name, ROOTSERVER_NAME))
+        {
 #if DEBUG_RESOLVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Received hostname and hostname for root name server differ\n");
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received hostname and hostname for root name server differ\n");
 #endif
-      GNUNET_break (0);
+          GNUNET_break (0);
+        }
     }
-  }
 
 #if DEBUG_RESOLVER
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "System's own reverse name resolution is working\n");
+              "System's own reverse name resolution is working\n");
 #endif
 
   /* Resolve the same using GNUNET */
@@ -360,8 +361,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   sa.sin_addr.S_un.S_addr = inet_addr (ROOTSERVER_IP);
 #endif
   GNUNET_RESOLVER_hostname_get ((const struct sockaddr *) &sa,
-                                sizeof (struct sockaddr), GNUNET_YES, timeout,
-                                &check_rootserver_name, cls);
+                                sizeof (struct sockaddr), GNUNET_YES, timeout,
+                                &check_rootserver_name, cls);
 
   memset (&sa, 0, sizeof (sa));
   sa.sin_family = AF_INET;
@@ -372,12 +373,12 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   GNUNET_RESOLVER_ip_get ("localhost", AF_INET, timeout, &check_127, cls);
   GNUNET_RESOLVER_hostname_get ((const struct sockaddr *) &sa,
-                                sizeof (struct sockaddr), GNUNET_YES, timeout,
-                                &check_localhost, cls);
+                                sizeof (struct sockaddr), GNUNET_YES, timeout,
+                                &check_localhost, cls);
 
   GNUNET_RESOLVER_hostname_get ((const struct sockaddr *) &sa,
-                                sizeof (struct sockaddr), GNUNET_NO, timeout,
-                                &check_localhost_num, cls);
+                                sizeof (struct sockaddr), GNUNET_NO, timeout,
+                                &check_localhost_num, cls);
   GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, timeout, &check_hostname, cls);
 
 }
@@ -391,33 +392,33 @@ check ()
   struct GNUNET_OS_Process *proc;
 
   char *const argv[] =
-      { "test-resolver-api", "-c", "test_resolver_api_data.conf",
+    { "test-resolver-api", "-c", "test_resolver_api_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
 #endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] =
-      { GNUNET_GETOPT_OPTION_END };
+    { GNUNET_GETOPT_OPTION_END };
   pfx = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
   GNUNET_asprintf (&fn, "%s%cgnunet-service-resolver", pfx, DIR_SEPARATOR);
   GNUNET_free (pfx);
   proc = GNUNET_OS_start_process (NULL, NULL, fn, "gnunet-service-resolver",
 #if VERBOSE
-                                  "-L", "DEBUG",
+                                  "-L", "DEBUG",
 #endif
-                                  "-c", "test_resolver_api_data.conf", NULL);
+                                  "-c", "test_resolver_api_data.conf", NULL);
   GNUNET_assert (NULL != proc);
   GNUNET_free (fn);
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                     argv, "test-resolver-api", "nohelp",
-                                     options, &run, &ok));
+                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                                     argv, "test-resolver-api", "nohelp",
+                                     options, &run, &ok));
   if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    ok = 1;
-  }
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      ok = 1;
+    }
   GNUNET_OS_process_wait (proc);
   GNUNET_OS_process_close (proc);
   proc = NULL;
@@ -433,11 +434,11 @@ main (int argc, char *argv[])
 
   GNUNET_log_setup ("test-resolver-api",
 #if VERBOSE
-                    "DEBUG",
+                    "DEBUG",
 #else
-                    "WARNING",
+                    "WARNING",
 #endif
-                    NULL);
+                    NULL);
   ret = check ();
 
   return ret;