global reindent, now with uncrustify hook enabled

1 files changed, 93 insertions, 93 deletions

diff --git a/src/util/test_service.c b/src/util/test_service.c
index 4edc38a0d..6db8471bd 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -43,20 +43,20 @@ static struct GNUNET_SCHEDULER_Task *tt;
 
 
 static void
-handle_recv(void *cls,
-            const struct GNUNET_MessageHeader *message)
+handle_recv (void *cls,
+             const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_SERVICE_Client *client = cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received client message...\n");
-  GNUNET_SERVICE_client_continue(client);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received client message...\n");
+  GNUNET_SERVICE_client_continue (client);
   global_ret = 2;
   if (NULL != mq)
-    {
-      GNUNET_MQ_destroy(mq);
-      mq = NULL;
-    }
+  {
+    GNUNET_MQ_destroy (mq);
+    mq = NULL;
+  }
 }
 
 
@@ -69,9 +69,9 @@ handle_recv(void *cls,
  * @return @a c so we have the client handle in the future
  */
 static void *
-connect_cb(void *cls,
-           struct GNUNET_SERVICE_Client *c,
-           struct GNUNET_MQ_Handle *mq)
+connect_cb (void *cls,
+            struct GNUNET_SERVICE_Client *c,
+            struct GNUNET_MQ_Handle *mq)
 {
   /* FIXME: in the future, do something with mq
      to test sending messages to the client! */
@@ -87,35 +87,35 @@ connect_cb(void *cls,
  * @param internal_cls must match @a c
  */
 static void
-disconnect_cb(void *cls,
-              struct GNUNET_SERVICE_Client *c,
-              void *internal_cls)
+disconnect_cb (void *cls,
+               struct GNUNET_SERVICE_Client *c,
+               void *internal_cls)
 {
-  GNUNET_assert(c == internal_cls);
+  GNUNET_assert (c == internal_cls);
   if (2 == global_ret)
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = 0;
+    if (NULL != tt)
     {
-      GNUNET_SCHEDULER_shutdown();
-      global_ret = 0;
-      if (NULL != tt)
-        {
-          GNUNET_SCHEDULER_cancel(tt);
-          tt = NULL;
-        }
+      GNUNET_SCHEDULER_cancel (tt);
+      tt = NULL;
     }
+  }
 }
 
 
 static void
-timeout_task(void *cls)
+timeout_task (void *cls)
 {
   tt = NULL;
   if (NULL != mq)
-    {
-      GNUNET_MQ_destroy(mq);
-      mq = NULL;
-    }
+  {
+    GNUNET_MQ_destroy (mq);
+    mq = NULL;
+  }
   global_ret = 33;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -128,28 +128,28 @@ timeout_task(void *cls)
  * @param sh handle to the service
  */
 static void
-service_init(void *cls,
-             const struct GNUNET_CONFIGURATION_Handle *cfg,
-             struct GNUNET_SERVICE_Handle *sh)
+service_init (void *cls,
+              const struct GNUNET_CONFIGURATION_Handle *cfg,
+              struct GNUNET_SERVICE_Handle *sh)
 {
   const char *service_name = cls;
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
 
-  GNUNET_assert(NULL == tt);
-  tt = GNUNET_SCHEDULER_add_delayed(TIMEOUT,
-                                    &timeout_task,
-                                    NULL);
-  mq = GNUNET_CLIENT_connect(cfg,
-                             service_name,
-                             NULL,
-                             NULL,
-                             NULL);
-  GNUNET_assert(NULL != mq);
-  env = GNUNET_MQ_msg(msg,
-                      MY_TYPE);
-  GNUNET_MQ_send(mq,
-                 env);
+  GNUNET_assert (NULL == tt);
+  tt = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                     &timeout_task,
+                                     NULL);
+  mq = GNUNET_CLIENT_connect (cfg,
+                              service_name,
+                              NULL,
+                              NULL,
+                              NULL);
+  GNUNET_assert (NULL != mq);
+  env = GNUNET_MQ_msg (msg,
+                       MY_TYPE);
+  GNUNET_MQ_send (mq,
+                  env);
 }
 
 
@@ -160,77 +160,77 @@ service_init(void *cls,
  * @param sname name of the service to run
  */
 static int
-check(const char *sname)
+check (const char *sname)
 {
   struct GNUNET_MQ_MessageHandler myhandlers[] = {
-    GNUNET_MQ_hd_fixed_size(recv,
-                            MY_TYPE,
-                            struct GNUNET_MessageHeader,
-                            NULL),
-    GNUNET_MQ_handler_end()
+    GNUNET_MQ_hd_fixed_size (recv,
+                             MY_TYPE,
+                             struct GNUNET_MessageHeader,
+                             NULL),
+    GNUNET_MQ_handler_end ()
   };
   char *const argv[] = {
-    (char *)sname,
+    (char *) sname,
     "-c",
     "test_service_data.conf",
     NULL
   };
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Starting `%s' service\n",
-             sname);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting `%s' service\n",
+              sname);
   global_ret = 1;
-  GNUNET_assert(0 ==
-                GNUNET_SERVICE_run_(3,
-                                    argv,
-                                    sname,
-                                    GNUNET_SERVICE_OPTION_NONE,
-                                    &service_init,
-                                    &connect_cb,
-                                    &disconnect_cb,
-                                    (void *)sname,
-                                    myhandlers));
+  GNUNET_assert (0 ==
+                 GNUNET_SERVICE_run_ (3,
+                                      argv,
+                                      sname,
+                                      GNUNET_SERVICE_OPTION_NONE,
+                                      &service_init,
+                                      &connect_cb,
+                                      &disconnect_cb,
+                                      (void *) sname,
+                                      myhandlers));
   return global_ret;
 }
 
 
 int
-main(int argc,
-     char *argv[])
+main (int argc,
+      char *argv[])
 {
   int ret = 0;
   struct GNUNET_NETWORK_Handle *s = NULL;
 
-  GNUNET_log_setup("test-service",
-                   "WARNING",
-                   NULL);
-  ret += check("test_service");
-  ret += check("test_service");
-  s = GNUNET_NETWORK_socket_create(PF_INET6,
-                                   SOCK_STREAM,
-                                   0);
+  GNUNET_log_setup ("test-service",
+                    "WARNING",
+                    NULL);
+  ret += check ("test_service");
+  ret += check ("test_service");
+  s = GNUNET_NETWORK_socket_create (PF_INET6,
+                                    SOCK_STREAM,
+                                    0);
 
   if (NULL == s)
+  {
+    if ((errno == ENOBUFS) ||
+        (errno == ENOMEM) ||
+        (errno == ENFILE) ||
+        (errno == EACCES))
     {
-      if ((errno == ENOBUFS) ||
-          (errno == ENOMEM) ||
-          (errno == ENFILE) ||
-          (errno == EACCES))
-        {
-          GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR,
-                              "socket");
-          return 1;
-        }
-      fprintf(stderr,
-              "IPv6 support seems to not be available (%s), not testing it!\n",
-              strerror(errno));
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                           "socket");
+      return 1;
     }
+    fprintf (stderr,
+             "IPv6 support seems to not be available (%s), not testing it!\n",
+             strerror (errno));
+  }
   else
-    {
-      GNUNET_break(GNUNET_OK ==
-                   GNUNET_NETWORK_socket_close(s));
-      ret += check("test_service6");
-    }
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_NETWORK_socket_close (s));
+    ret += check ("test_service6");
+  }
   return ret;
 }