uncrustify as demanded.

6 files changed, 224 insertions, 223 deletions

diff --git a/src/auction/auction.h b/src/auction/auction.h
index 74da53fdb..8324e1cb1 100644
--- a/src/auction/auction.h
+++ b/src/auction/auction.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Markus Teich
@@ -34,8 +34,7 @@ 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 3ee4d3554..42ab14aca 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/auction/gnunet-auction-create.c
@@ -11,12 +11,12 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-   */
+ */
 
 /**
  * @file auction/gnunet-auction-create.c
@@ -54,94 +54,94 @@ 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;
-        json_t *pmap;
-        json_t *parray;
-        json_t *pnode;
-        json_error_t jerr;
-
-        /* 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;
-        }
-        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;
-        }
-
-        /* 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))
-        {
-                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,
-                                    "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;
-        }
-
-        return;
+  unsigned int i;
+  double cur, prev = DBL_MAX;
+  json_t *pmap;
+  json_t *parray;
+  json_t *pnode;
+  json_error_t jerr;
+
+  /* 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;
+    }
+  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;
+    }
+
+  /* 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))
+    {
+      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,
+                   "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;
+  }
+
+  return;
 
 fail:
-        ret = 1;
-        return;
+  ret = 1;
+  return;
 }
 
 
@@ -153,64 +153,64 @@ 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_END
-        };
-        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);
-        return ret;
+  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_END
+  };
+
+  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);
+  return ret;
 }
diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c
index 58639a57c..ef46ca212 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/auction/gnunet-auction-info.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file auction/gnunet-auction.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,25 +59,26 @@ 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 */
     GNUNET_GETOPT_OPTION_END
   };
+
   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 58639a57c..ef46ca212 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/auction/gnunet-auction-join.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file auction/gnunet-auction.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,25 +59,26 @@ 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 */
     GNUNET_GETOPT_OPTION_END
   };
+
   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 a5518b0f3..ed1be20d8 100644
--- a/src/auction/gnunet-service-auction.c
+++ b/src/auction/gnunet-service-auction.c
@@ -11,12 +11,12 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-   */
+ */
 
 /**
  * @file auction/gnunet-service-auction.c
@@ -36,10 +36,10 @@
  * @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;
+  /* always well-formed due to arbitrary length description */
+  return GNUNET_OK;
 }
 
 
@@ -50,26 +50,26 @@ 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_SERVICE_Client *client = cls;
 //      struct GNUNET_MQ_Handle *mq;
 //      struct GNUNET_MQ_Envelope *env;
 //      struct GNUNET_AUCTION_blabla em;
-        uint16_t size;
+  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 */
+  /**TODO: create auction and return auction object */
 //      mq = GNUNET_SERVICE_client_get_mq (client);
 //      setup_info_message (&em);
 //      env = GNUNET_MQ_msg_copy (&em.header);
 //      GNUNET_MQ_send (mq, env);
 
-        GNUNET_SERVICE_client_continue (client);
+  GNUNET_SERVICE_client_continue(client);
 }
 
 
@@ -79,9 +79,9 @@ 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 */
+  /* FIXME: do clean up here */
 }
 
 
@@ -94,11 +94,11 @@ 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;
+  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);
+  /* FIXME: do setup here */
+  GNUNET_SCHEDULER_add_shutdown(&cleanup_task, NULL);
 }
 
 
@@ -139,17 +139,17 @@ run (void *cls,
  * Define "main" method using service macro.
  */
 GNUNET_SERVICE_MAIN
-("auction",
- GNUNET_SERVICE_OPTION_NONE,
- &run,
- &client_connect_cb,
- &client_disconnect_cb,
- NULL,
- GNUNET_MQ_hd_var_size (create,
+  ("auction",
+  GNUNET_SERVICE_OPTION_NONE,
+  &run,
+  &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_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 56b2a8192..39a002a5f 100644
--- a/src/auction/test_auction_api.c
+++ b/src/auction/test_auction_api.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file auction/test_auction_api.c
  * @brief testcase for auction.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;
 }