[GNUnet-SVN] r33629 - gnunet/src/peerinfo

[gnunet]

Author: grothoff
Date: 2014-06-11 07:57:20 +0200 (Wed, 11 Jun 2014)
New Revision: 33629

Modified:
   gnunet/src/peerinfo/test_peerinfo_shipped_hellos.c
Log:
-fix log level, logging, indentation

Modified: gnunet/src/peerinfo/test_peerinfo_shipped_hellos.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_shipped_hellos.c  2014-06-10 22:32:30 UTC 
(rev 33628)
+++ gnunet/src/peerinfo/test_peerinfo_shipped_hellos.c  2014-06-11 05:57:20 UTC 
(rev 33629)
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file peerinfo/test_peerinfo_api.c
+ * @file peerinfo/test_peerinfo_shipped_hellos.c
  * @brief testcase for shipped HELLOs getting parsed
  * @author Christian Grothoff
  * @author Matthias Wachs
@@ -40,17 +40,21 @@
 
 static int
 addr_cb (void *cls,
-                                const struct GNUNET_HELLO_Address *address,
-                                struct GNUNET_TIME_Absolute expiration)
-{;
-       int *addr = cls;
-       (*addr) ++;
-       return GNUNET_OK;
+         const struct GNUNET_HELLO_Address *address,
+         struct GNUNET_TIME_Absolute expiration)
+{
+  int *addr = cls;
+
+  (*addr) ++;
+  return GNUNET_OK;
 }
 
+
 static void
-process (void *cls, const struct GNUNET_PeerIdentity *peer,
-         const struct GNUNET_HELLO_Message *hello, const char *err_msg)
+process (void *cls,
+         const struct GNUNET_PeerIdentity *peer,
+         const struct GNUNET_HELLO_Message *hello,
+         const char *err_msg)
 {
   static unsigned int calls = 0;
   int addr;
@@ -62,30 +66,34 @@
   }
   if (NULL != peer)
   {
-       addr = 0;
-               if (NULL != hello)
-               {
-                       GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, 
&addr_cb, &addr);
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got information 
about peer `%s' with %u addresses \n",
-                                       GNUNET_i2s (peer), addr);
-               calls++;
-               }
-               else
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail: Got 
information about peer `%s' without HELLO \n",
-                                       GNUNET_i2s (peer));
+    addr = 0;
+    if (NULL != hello)
+    {
+      GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &addr_cb, &addr);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Got information about peer `%s' with %u addresses \n",
+                  GNUNET_i2s (peer), addr);
+      calls++;
+    }
+    else
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Fail: Got information about peer `%s' without HELLO \n",
+                  GNUNET_i2s (peer));
   }
   else
   {
-       if (0 == calls)
-       {
-               fprintf (stderr, "Failed: %u callbacks\n", calls);
-               global_ret = 1;
-       }
-       else
-       {
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u 
callbacks\n", calls);
-               global_ret = 0;
-       }
+    if (0 == calls)
+    {
+      fprintf (stderr,
+               "Failed: got no callbacks!\n");
+      global_ret = 1;
+    }
+    else
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Got %u callbacks\n", calls);
+        global_ret = 0;
+      }
   }
 }
 
@@ -107,7 +115,7 @@
 main (int argc, char *argv[])
 {
   global_ret = 3;
-  if (0 != GNUNET_TESTING_service_run ("test_peerinfo_system_hellos",
+  if (0 != GNUNET_TESTING_service_run ("test_peerinfo_shipped_hellos",
                                       "peerinfo",
                                       "test_peerinfo_api_data.conf",
                                       &run, NULL))