global reindent, now with uncrustify hook enabled

6 files changed, 170 insertions, 166 deletions

diff --git a/src/auction/auction.h b/src/auction/auction.h
index 8324e1cb1..dc8b933f6 100644
--- a/src/auction/auction.h
+++ b/src/auction/auction.h
@@ -34,7 +34,8 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Auction creation request sent from the client to the service
  */
-struct GNUNET_AUCTION_ClientCreateMessage {
+struct GNUNET_AUCTION_ClientCreateMessage
+{
   /**
    * Type: GNUNET_MESSAGE_TYPE_AUCTION_CLIENT_CREATE
    */
diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c
index 42ab14aca..90c1d5f10 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/auction/gnunet-auction-create.c
@@ -54,10 +54,10 @@ static int interactive; /** keep running in foreground */
  * @param cfg configuration
  */
 static void
-run(void *cls,
-    char *const *args,
-    const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   unsigned int i;
   double cur, prev = DBL_MAX;
@@ -68,72 +68,72 @@ run(void *cls,
 
   /* cmdline parsing */
   if (GNUNET_TIME_UNIT_ZERO.rel_value_us == dstart.rel_value_us)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "required argument --regtime missing or invalid (zero)\n");
-      goto fail;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "required argument --regtime missing or invalid (zero)\n");
+    goto fail;
+  }
   if (GNUNET_TIME_UNIT_ZERO.rel_value_us == dround.rel_value_us)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "required argument --roundtime missing or invalid (zero)\n");
-      goto fail;
-    }
-  if (!fndesc)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "required argument --description missing\n");
-      goto fail;
-    }
-  if (!fnprices)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "required argument --pricemap missing\n");
-      goto fail;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "required argument --roundtime missing or invalid (zero)\n");
+    goto fail;
+  }
+  if (! fndesc)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "required argument --description missing\n");
+    goto fail;
+  }
+  if (! fnprices)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "required argument --pricemap missing\n");
+    goto fail;
+  }
 
   /* parse and check pricemap validity */
-  if (!(pmap = json_load_file(fnprices, JSON_DECODE_INT_AS_REAL, &jerr)))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "parsing pricemap json at %d:%d: %s\n",
-                 jerr.line, jerr.column, jerr.text);
-      goto fail;
-    }
-  if (-1 == json_unpack_ex(pmap, &jerr, JSON_VALIDATE_ONLY,
-                           "{s:s, s:[]}", "currency", "prices"))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "validating pricemap: %s\n", jerr.text);
-      goto fail;
-    }
-  if (!(parray = json_object_get(pmap, "prices")) || !json_is_array(parray))
+  if (! (pmap = json_load_file (fnprices, JSON_DECODE_INT_AS_REAL, &jerr)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "parsing pricemap json at %d:%d: %s\n",
+                jerr.line, jerr.column, jerr.text);
+    goto fail;
+  }
+  if (-1 == json_unpack_ex (pmap, &jerr, JSON_VALIDATE_ONLY,
+                            "{s:s, s:[]}", "currency", "prices"))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "validating pricemap: %s\n", jerr.text);
+    goto fail;
+  }
+  if (! (parray = json_object_get (pmap, "prices")) || ! json_is_array (parray))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "could not get `prices` array node from pricemap\n");
+    goto fail;
+  }
+  if (0 == json_array_size (parray))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "empty pricemap array\n");
+    goto fail;
+  }
+  json_array_foreach (parray, i, pnode)
+  {
+    if (-1 == json_unpack_ex (pnode, &jerr, 0, "F", &cur))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "could not get `prices` array node from pricemap\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "validating pricearray index %d: %s\n", i, jerr.text);
       goto fail;
     }
-  if (0 == json_array_size(parray))
+    if (prev <= cur)
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "empty pricemap array\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "validating pricearray index %d: "
+                  "prices must be strictly monotonically decreasing\n",
+                  i);
       goto fail;
     }
-  json_array_foreach(parray, i, pnode)
-  {
-    if (-1 == json_unpack_ex(pnode, &jerr, 0, "F", &cur))
-      {
-        GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                   "validating pricearray index %d: %s\n", i, jerr.text);
-        goto fail;
-      }
-    if (prev <= cur)
-      {
-        GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                   "validating pricearray index %d: "
-                   "prices must be strictly monotonically decreasing\n",
-                   i);
-        goto fail;
-      }
     prev = cur;
   }
 
@@ -153,64 +153,67 @@ fail:
  * @return 0 ok, 1 on error
  */
 int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_filename('d',
-                                  "description",
-                                  "FILE",
-                                  gettext_noop("description of the item to be sold"),
-                                  &fndesc),
-
-    GNUNET_GETOPT_option_filename('p',
-                                  "pricemap",
-                                  "FILE",
-                                  gettext_noop("mapping of possible prices"),
-                                  &fnprices),
-
-    GNUNET_GETOPT_option_relative_time('r',
-                                       "roundtime",
-                                       "DURATION",
-                                       gettext_noop("max duration per round"),
-                                       &dround),
-
-    GNUNET_GETOPT_option_relative_time('s',
-                                       "regtime",
-                                       "DURATION",
-                                       gettext_noop("duration until auction starts"),
-                                       &dstart),
-    GNUNET_GETOPT_option_uint('m',
-                              "m",
-                              "NUMBER",
-                              gettext_noop("number of items to sell\n"
-                                           "0 for first price auction\n"
-                                           ">0 for vickrey/M+1st price auction"),
-                              &m),
-
-    GNUNET_GETOPT_option_flag('u',
-                              "public",
-                              gettext_noop("public auction outcome"),
-                              &outcome),
-
-    GNUNET_GETOPT_option_flag('i',
-                              "interactive",
-                              gettext_noop("keep running in foreground until auction completes"),
-                              &interactive),
+    GNUNET_GETOPT_option_filename ('d',
+                                   "description",
+                                   "FILE",
+                                   gettext_noop (
+                                     "description of the item to be sold"),
+                                   &fndesc),
+
+    GNUNET_GETOPT_option_filename ('p',
+                                   "pricemap",
+                                   "FILE",
+                                   gettext_noop ("mapping of possible prices"),
+                                   &fnprices),
+
+    GNUNET_GETOPT_option_relative_time ('r',
+                                        "roundtime",
+                                        "DURATION",
+                                        gettext_noop ("max duration per round"),
+                                        &dround),
+
+    GNUNET_GETOPT_option_relative_time ('s',
+                                        "regtime",
+                                        "DURATION",
+                                        gettext_noop (
+                                          "duration until auction starts"),
+                                        &dstart),
+    GNUNET_GETOPT_option_uint ('m',
+                               "m",
+                               "NUMBER",
+                               gettext_noop ("number of items to sell\n"
+                                             "0 for first price auction\n"
+                                             ">0 for vickrey/M+1st price auction"),
+                               &m),
+
+    GNUNET_GETOPT_option_flag ('u',
+                               "public",
+                               gettext_noop ("public auction outcome"),
+                               &outcome),
+
+    GNUNET_GETOPT_option_flag ('i',
+                               "interactive",
+                               gettext_noop (
+                                 "keep running in foreground until auction completes"),
+                               &interactive),
 
     GNUNET_GETOPT_OPTION_END
   };
 
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
   ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run(argc, argv,
-                            "gnunet-auction-create",
-                            gettext_noop("create a new auction and "
-                                         "start listening for bidders"),
-                            options,
-                            &run,
-                            NULL)) ? ret : 1;
-  GNUNET_free((void*)argv);
+         GNUNET_PROGRAM_run (argc, argv,
+                             "gnunet-auction-create",
+                             gettext_noop ("create a new auction and "
+                                           "start listening for bidders"),
+                             options,
+                             &run,
+                             NULL)) ? ret : 1;
+  GNUNET_free ((void*) argv);
   return ret;
 }
diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c
index ef46ca212..05bee50ef 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/auction/gnunet-auction-info.c
@@ -42,10 +42,10 @@ static int ret;
  * @param cfg configuration
  */
 static void
-run(void *cls,
-    char *const *args,
-    const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   /* main code here */
 }
@@ -59,7 +59,7 @@ run(void *cls,
  * @return 0 ok, 1 on error
  */
 int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     /* FIMXE: add options here */
@@ -67,18 +67,18 @@ main(int argc, char *const *argv)
   };
 
   if (GNUNET_OK !=
-      GNUNET_STRINGS_get_utf8_args(argc, argv,
-                                   &argc, &argv))
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
     return 2;
 
   ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run(argc, argv,
-                            "gnunet-auction",
-                            gettext_noop("help text"),
-                            options,
-                            &run,
-                            NULL)) ? ret : 1;
-  GNUNET_free((void*)argv);
+         GNUNET_PROGRAM_run (argc, argv,
+                             "gnunet-auction",
+                             gettext_noop ("help text"),
+                             options,
+                             &run,
+                             NULL)) ? ret : 1;
+  GNUNET_free ((void*) argv);
   return ret;
 }
 
diff --git a/src/auction/gnunet-auction-join.c b/src/auction/gnunet-auction-join.c
index ef46ca212..05bee50ef 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/auction/gnunet-auction-join.c
@@ -42,10 +42,10 @@ static int ret;
  * @param cfg configuration
  */
 static void
-run(void *cls,
-    char *const *args,
-    const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   /* main code here */
 }
@@ -59,7 +59,7 @@ run(void *cls,
  * @return 0 ok, 1 on error
  */
 int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     /* FIMXE: add options here */
@@ -67,18 +67,18 @@ main(int argc, char *const *argv)
   };
 
   if (GNUNET_OK !=
-      GNUNET_STRINGS_get_utf8_args(argc, argv,
-                                   &argc, &argv))
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
     return 2;
 
   ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run(argc, argv,
-                            "gnunet-auction",
-                            gettext_noop("help text"),
-                            options,
-                            &run,
-                            NULL)) ? ret : 1;
-  GNUNET_free((void*)argv);
+         GNUNET_PROGRAM_run (argc, argv,
+                             "gnunet-auction",
+                             gettext_noop ("help text"),
+                             options,
+                             &run,
+                             NULL)) ? ret : 1;
+  GNUNET_free ((void*) argv);
   return ret;
 }
 
diff --git a/src/auction/gnunet-service-auction.c b/src/auction/gnunet-service-auction.c
index ed1be20d8..82519919d 100644
--- a/src/auction/gnunet-service-auction.c
+++ b/src/auction/gnunet-service-auction.c
@@ -36,7 +36,7 @@
  * @return #GNUNET_OK (always)
  */
 static int
-check_create(void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
+check_create (void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
 {
   /* always well-formed due to arbitrary length description */
   return GNUNET_OK;
@@ -50,7 +50,7 @@ check_create(void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
  * @param msg the actual message received
  */
 static void
-handle_create(void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
+handle_create (void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
 {
   struct GNUNET_SERVICE_Client *client = cls;
 //      struct GNUNET_MQ_Handle *mq;
@@ -58,10 +58,10 @@ handle_create(void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
 //      struct GNUNET_AUCTION_blabla em;
   uint16_t size;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received CREATE message from client\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received CREATE message from client\n");
 
-  size = ntohs(msg->header.size);
+  size = ntohs (msg->header.size);
 
   /**TODO: create auction and return auction object */
 //      mq = GNUNET_SERVICE_client_get_mq (client);
@@ -69,7 +69,7 @@ handle_create(void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
 //      env = GNUNET_MQ_msg_copy (&em.header);
 //      GNUNET_MQ_send (mq, env);
 
-  GNUNET_SERVICE_client_continue(client);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
@@ -79,7 +79,7 @@ handle_create(void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg)
  * @param cls unused
  */
 static void
-cleanup_task(void *cls)
+cleanup_task (void *cls)
 {
   /* FIXME: do clean up here */
 }
@@ -94,9 +94,9 @@ cleanup_task(void *cls)
  * @return @a c
  */
 static void *
-client_connect_cb(void *cls,
-                  struct GNUNET_SERVICE_Client *c,
-                  struct GNUNET_MQ_Handle *mq)
+client_connect_cb (void *cls,
+                   struct GNUNET_SERVICE_Client *c,
+                   struct GNUNET_MQ_Handle *mq)
 {
   return c;
 }
@@ -110,11 +110,11 @@ client_connect_cb(void *cls,
  * @param internal_cls should be equal to @a c
  */
 static void
-client_disconnect_cb(void *cls,
-                     struct GNUNET_SERVICE_Client *c,
-                     void *internal_cls)
+client_disconnect_cb (void *cls,
+                      struct GNUNET_SERVICE_Client *c,
+                      void *internal_cls)
 {
-  GNUNET_assert(c == internal_cls);
+  GNUNET_assert (c == internal_cls);
 }
 
 
@@ -126,12 +126,12 @@ client_disconnect_cb(void *cls,
  * @param service the initialized service
  */
 static void
-run(void *cls,
-    const struct GNUNET_CONFIGURATION_Handle *cfg,
-    struct GNUNET_SERVICE_Handle *service)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_SERVICE_Handle *service)
 {
   /* FIXME: do setup here */
-  GNUNET_SCHEDULER_add_shutdown(&cleanup_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
 }
 
 
@@ -145,11 +145,11 @@ GNUNET_SERVICE_MAIN
   &client_connect_cb,
   &client_disconnect_cb,
   NULL,
-  GNUNET_MQ_hd_var_size(create,
-                        GNUNET_MESSAGE_TYPE_AUCTION_CLIENT_CREATE,
-                        struct GNUNET_AUCTION_ClientCreateMessage,
-                        NULL),
-  GNUNET_MQ_handler_end())
+  GNUNET_MQ_hd_var_size (create,
+                         GNUNET_MESSAGE_TYPE_AUCTION_CLIENT_CREATE,
+                         struct GNUNET_AUCTION_ClientCreateMessage,
+                         NULL),
+  GNUNET_MQ_handler_end ())
 
 
 /* end of gnunet-service-auction.c */
diff --git a/src/auction/test_auction_api.c b/src/auction/test_auction_api.c
index 39a002a5f..0ec6f8cc8 100644
--- a/src/auction/test_auction_api.c
+++ b/src/auction/test_auction_api.c
@@ -24,17 +24,17 @@
 #include "platform.h"
 
 static int
-check()
+check ()
 {
   return 0;
 }
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   int ret;
 
-  ret = check();
+  ret = check ();
 
   return ret;
 }