1 files changed, 103 insertions, 102 deletions

diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 7e38b4297..988fa7a1e 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -31,19 +31,20 @@
  * Logging shorthand
  */
 #define LOG(type, ...)                          \
-  GNUNET_log_from(type, "testbed-api-barriers", __VA_ARGS__);
+  GNUNET_log_from (type, "testbed-api-barriers", __VA_ARGS__);
 
 /**
  * Debug logging shorthand
  */
 #define LOG_DEBUG(...)                          \
-  LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__);
 
 
 /**
  * Barrier wait handle
  */
-struct GNUNET_TESTBED_BarrierWaitHandle {
+struct GNUNET_TESTBED_BarrierWaitHandle
+{
   /**
    * The name of the barrier
    */
@@ -80,8 +81,8 @@ struct GNUNET_TESTBED_BarrierWaitHandle {
  * @return #GNUNET_OK if the message is well-formed.
  */
 static int
-check_status(void *cls,
-             const struct GNUNET_TESTBED_BarrierStatusMsg *msg)
+check_status (void *cls,
+              const struct GNUNET_TESTBED_BarrierStatusMsg *msg)
 {
   /* FIXME: this fails to actually check that the message
      follows the protocol spec (0-terminations!).  However,
@@ -99,43 +100,43 @@ check_status(void *cls,
  * @param msg received message
  */
 static void
-handle_status(void *cls,
-              const struct GNUNET_TESTBED_BarrierStatusMsg *msg)
+handle_status (void *cls,
+               const struct GNUNET_TESTBED_BarrierStatusMsg *msg)
 {
   struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Got barrier status %d\n",
-             (int)ntohs(msg->status));
-  switch (ntohs(msg->status))
-    {
-    case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
-      h->cb(h->cb_cls,
-            h->name,
-            GNUNET_SYSERR);
-      break;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Got barrier status %d\n",
+              (int) ntohs (msg->status));
+  switch (ntohs (msg->status))
+  {
+  case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
+    h->cb (h->cb_cls,
+           h->name,
+           GNUNET_SYSERR);
+    break;
 
-    case GNUNET_TESTBED_BARRIERSTATUS_INITIALISED:
-      h->cb(h->cb_cls,
-            h->name,
-            GNUNET_SYSERR);
-      GNUNET_break(0);
-      break;
+  case GNUNET_TESTBED_BARRIERSTATUS_INITIALISED:
+    h->cb (h->cb_cls,
+           h->name,
+           GNUNET_SYSERR);
+    GNUNET_break (0);
+    break;
 
-    case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
-      h->cb(h->cb_cls,
-            h->name,
-            GNUNET_OK);
-      break;
+  case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
+    h->cb (h->cb_cls,
+           h->name,
+           GNUNET_OK);
+    break;
 
-    default:
-      GNUNET_break_op(0);
-      h->cb(h->cb_cls,
-            h->name,
-            GNUNET_SYSERR);
-      break;
-    }
-  GNUNET_TESTBED_barrier_wait_cancel(h);
+  default:
+    GNUNET_break_op (0);
+    h->cb (h->cb_cls,
+           h->name,
+           GNUNET_SYSERR);
+    break;
+  }
+  GNUNET_TESTBED_barrier_wait_cancel (h);
 }
 
 
@@ -148,15 +149,15 @@ handle_status(void *cls,
  * @param error error code
  */
 static void
-mq_error_handler(void *cls,
-                 enum GNUNET_MQ_Error error)
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
 {
   struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
 
-  h->cb(h->cb_cls,
-        h->name,
-        GNUNET_SYSERR);
-  GNUNET_TESTBED_barrier_wait_cancel(h);
+  h->cb (h->cb_cls,
+         h->name,
+         GNUNET_SYSERR);
+  GNUNET_TESTBED_barrier_wait_cancel (h);
 }
 
 
@@ -172,72 +173,72 @@ mq_error_handler(void *cls,
  *   anytime before the callback is called.  NULL upon error.
  */
 struct GNUNET_TESTBED_BarrierWaitHandle *
-GNUNET_TESTBED_barrier_wait(const char *name,
-                            GNUNET_TESTBED_barrier_wait_cb cb,
-                            void *cb_cls)
+GNUNET_TESTBED_barrier_wait (const char *name,
+                             GNUNET_TESTBED_barrier_wait_cb cb,
+                             void *cb_cls)
 {
   struct GNUNET_TESTBED_BarrierWaitHandle *h
-    = GNUNET_new(struct GNUNET_TESTBED_BarrierWaitHandle);
+    = GNUNET_new (struct GNUNET_TESTBED_BarrierWaitHandle);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size(status,
-                          GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS,
-                          struct GNUNET_TESTBED_BarrierStatusMsg,
-                          h),
-    GNUNET_MQ_handler_end()
+    GNUNET_MQ_hd_var_size (status,
+                           GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS,
+                           struct GNUNET_TESTBED_BarrierStatusMsg,
+                           h),
+    GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_TESTBED_BarrierWait *msg;
   const char *cfg_filename;
   size_t name_len;
 
-  GNUNET_assert(NULL != cb);
-  cfg_filename = getenv(ENV_TESTBED_CONFIG);
+  GNUNET_assert (NULL != cb);
+  cfg_filename = getenv (ENV_TESTBED_CONFIG);
   if (NULL == cfg_filename)
-    {
-      LOG(GNUNET_ERROR_TYPE_ERROR,
-          "Are you running under testbed?\n");
-      GNUNET_free(h);
-      return NULL;
-    }
-  h->cfg = GNUNET_CONFIGURATION_create();
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Are you running under testbed?\n");
+    GNUNET_free (h);
+    return NULL;
+  }
+  h->cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_load(h->cfg,
-                                cfg_filename))
-    {
-      LOG(GNUNET_ERROR_TYPE_ERROR,
-          "Unable to load configuration from file `%s'\n",
-          cfg_filename);
-      GNUNET_CONFIGURATION_destroy(h->cfg);
-      GNUNET_free(h);
-      return NULL;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Waiting on barrier `%s'\n",
-             name);
-  h->name = GNUNET_strdup(name);
+      GNUNET_CONFIGURATION_load (h->cfg,
+                                 cfg_filename))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Unable to load configuration from file `%s'\n",
+         cfg_filename);
+    GNUNET_CONFIGURATION_destroy (h->cfg);
+    GNUNET_free (h);
+    return NULL;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Waiting on barrier `%s'\n",
+              name);
+  h->name = GNUNET_strdup (name);
   h->cb = cb;
   h->cb_cls = cb_cls;
-  h->mq = GNUNET_CLIENT_connect(h->cfg,
-                                "testbed-barrier",
-                                handlers,
-                                &mq_error_handler,
-                                h);
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
+                                 "testbed-barrier",
+                                 handlers,
+                                 &mq_error_handler,
+                                 h);
   if (NULL == h->mq)
-    {
-      LOG(GNUNET_ERROR_TYPE_ERROR,
-          "Unable to connect to local testbed-barrier service\n");
-      GNUNET_TESTBED_barrier_wait_cancel(h);
-      return NULL;
-    }
-  name_len = strlen(name);  /* NOTE: unusual to not have 0-termination, change? */
-  env = GNUNET_MQ_msg_extra(msg,
-                            name_len,
-                            GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT);
-  GNUNET_memcpy(msg->name,
-                name,
-                name_len);
-  GNUNET_MQ_send(h->mq,
-                 env);
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Unable to connect to local testbed-barrier service\n");
+    GNUNET_TESTBED_barrier_wait_cancel (h);
+    return NULL;
+  }
+  name_len = strlen (name);  /* NOTE: unusual to not have 0-termination, change? */
+  env = GNUNET_MQ_msg_extra (msg,
+                             name_len,
+                             GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT);
+  GNUNET_memcpy (msg->name,
+                 name,
+                 name_len);
+  GNUNET_MQ_send (h->mq,
+                  env);
   return h;
 }
 
@@ -248,16 +249,16 @@ GNUNET_TESTBED_barrier_wait(const char *name,
  * @param h the barrier wait handle
  */
 void
-GNUNET_TESTBED_barrier_wait_cancel(struct GNUNET_TESTBED_BarrierWaitHandle *h)
+GNUNET_TESTBED_barrier_wait_cancel (struct GNUNET_TESTBED_BarrierWaitHandle *h)
 {
   if (NULL != h->mq)
-    {
-      GNUNET_MQ_destroy(h->mq);
-      h->mq = NULL;
-    }
-  GNUNET_free(h->name);
-  GNUNET_CONFIGURATION_destroy(h->cfg);
-  GNUNET_free(h);
+  {
+    GNUNET_MQ_destroy (h->mq);
+    h->mq = NULL;
+  }
+  GNUNET_free (h->name);
+  GNUNET_CONFIGURATION_destroy (h->cfg);
+  GNUNET_free (h);
 }
 
 /* end of testbed_api_barriers.c */