global reindent, now with uncrustify hook enabled

1 files changed, 72 insertions, 71 deletions

diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index 151b8256c..372ac705d 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -38,7 +38,8 @@
 /**
  * Context for the KSK publication.
  */
-struct GNUNET_FS_PublishKskContext {
+struct GNUNET_FS_PublishKskContext
+{
   /**
    * Keywords to use.
    */
@@ -72,7 +73,7 @@ struct GNUNET_FS_PublishKskContext {
   /**
    * Current task.
    */
-  struct GNUNET_SCHEDULER_Task * ksk_task;
+  struct GNUNET_SCHEDULER_Task *ksk_task;
 
   /**
    * Function to call once we're done.
@@ -109,7 +110,7 @@ struct GNUNET_FS_PublishKskContext {
  * @param cls closure of type `struct PublishKskContext *`
  */
 static void
-publish_ksk_cont(void *cls);
+publish_ksk_cont (void *cls);
 
 
 /**
@@ -120,21 +121,21 @@ publish_ksk_cont(void *cls);
  * @param msg error message (or NULL)
  */
 static void
-kb_put_cont(void *cls,
-            const char *msg)
+kb_put_cont (void *cls,
+             const char *msg)
 {
   struct GNUNET_FS_PublishKskContext *pkc = cls;
 
   pkc->uc = NULL;
   if (NULL != msg)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "KBlock PUT operation failed: %s\n", msg);
-      pkc->cont(pkc->cont_cls, NULL, msg);
-      GNUNET_FS_publish_ksk_cancel(pkc);
-      return;
-    }
-  pkc->ksk_task = GNUNET_SCHEDULER_add_now(&publish_ksk_cont, pkc);
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "KBlock PUT operation failed: %s\n", msg);
+    pkc->cont (pkc->cont_cls, NULL, msg);
+    GNUNET_FS_publish_ksk_cancel (pkc);
+    return;
+  }
+  pkc->ksk_task = GNUNET_SCHEDULER_add_now (&publish_ksk_cont, pkc);
 }
 
 
@@ -145,7 +146,7 @@ kb_put_cont(void *cls,
  * @param cls closure of type `struct GNUNET_FS_PublishKskContext *`
  */
 static void
-publish_ksk_cont(void *cls)
+publish_ksk_cont (void *cls)
 {
   struct GNUNET_FS_PublishKskContext *pkc = cls;
   const char *keyword;
@@ -153,25 +154,25 @@ publish_ksk_cont(void *cls)
   pkc->ksk_task = NULL;
   if ((pkc->i == pkc->ksk_uri->data.ksk.keywordCount) ||
       (NULL == pkc->dsh))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "KSK PUT operation complete\n");
-      pkc->cont(pkc->cont_cls, pkc->ksk_uri,
-                NULL);
-      GNUNET_FS_publish_ksk_cancel(pkc);
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "KSK PUT operation complete\n");
+    pkc->cont (pkc->cont_cls, pkc->ksk_uri,
+               NULL);
+    GNUNET_FS_publish_ksk_cancel (pkc);
+    return;
+  }
   keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
-  pkc->uc = GNUNET_FS_publish_ublock_(pkc->h,
-                                      pkc->dsh,
-                                      keyword + 1 /* skip '+' */,
-                                      NULL,
-                                      GNUNET_CRYPTO_ecdsa_key_get_anonymous(),
-                                      pkc->meta,
-                                      pkc->uri,
-                                      &pkc->bo,
-                                      pkc->options,
-                                      &kb_put_cont, pkc);
+  pkc->uc = GNUNET_FS_publish_ublock_ (pkc->h,
+                                       pkc->dsh,
+                                       keyword + 1 /* skip '+' */,
+                                       NULL,
+                                       GNUNET_CRYPTO_ecdsa_key_get_anonymous (),
+                                       pkc->meta,
+                                       pkc->uri,
+                                       &pkc->bo,
+                                       pkc->options,
+                                       &kb_put_cont, pkc);
 }
 
 
@@ -189,39 +190,39 @@ publish_ksk_cont(void *cls)
  * @return NULL on error ('cont' will still be called)
  */
 struct GNUNET_FS_PublishKskContext *
-GNUNET_FS_publish_ksk(struct GNUNET_FS_Handle *h,
-                      const struct GNUNET_FS_Uri *ksk_uri,
-                      const struct GNUNET_CONTAINER_MetaData *meta,
-                      const struct GNUNET_FS_Uri *uri,
-                      const struct GNUNET_FS_BlockOptions *bo,
-                      enum GNUNET_FS_PublishOptions options,
-                      GNUNET_FS_PublishContinuation cont, void *cont_cls)
+GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
+                       const struct GNUNET_FS_Uri *ksk_uri,
+                       const struct GNUNET_CONTAINER_MetaData *meta,
+                       const struct GNUNET_FS_Uri *uri,
+                       const struct GNUNET_FS_BlockOptions *bo,
+                       enum GNUNET_FS_PublishOptions options,
+                       GNUNET_FS_PublishContinuation cont, void *cont_cls)
 {
   struct GNUNET_FS_PublishKskContext *pkc;
 
-  GNUNET_assert(NULL != uri);
-  pkc = GNUNET_new(struct GNUNET_FS_PublishKskContext);
+  GNUNET_assert (NULL != uri);
+  pkc = GNUNET_new (struct GNUNET_FS_PublishKskContext);
   pkc->h = h;
   pkc->bo = *bo;
   pkc->options = options;
   pkc->cont = cont;
   pkc->cont_cls = cont_cls;
-  pkc->meta = GNUNET_CONTAINER_meta_data_duplicate(meta);
+  pkc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   if (0 == (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
+  {
+    pkc->dsh = GNUNET_DATASTORE_connect (h->cfg);
+    if (NULL == pkc->dsh)
     {
-      pkc->dsh = GNUNET_DATASTORE_connect(h->cfg);
-      if (NULL == pkc->dsh)
-        {
-          cont(cont_cls,
-               NULL,
-               _("Could not connect to datastore."));
-          GNUNET_free(pkc);
-          return NULL;
-        }
+      cont (cont_cls,
+            NULL,
+            _ ("Could not connect to datastore."));
+      GNUNET_free (pkc);
+      return NULL;
     }
-  pkc->uri = GNUNET_FS_uri_dup(uri);
-  pkc->ksk_uri = GNUNET_FS_uri_dup(ksk_uri);
-  pkc->ksk_task = GNUNET_SCHEDULER_add_now(&publish_ksk_cont, pkc);
+  }
+  pkc->uri = GNUNET_FS_uri_dup (uri);
+  pkc->ksk_uri = GNUNET_FS_uri_dup (ksk_uri);
+  pkc->ksk_task = GNUNET_SCHEDULER_add_now (&publish_ksk_cont, pkc);
   return pkc;
 }
 
@@ -232,27 +233,27 @@ GNUNET_FS_publish_ksk(struct GNUNET_FS_Handle *h,
  * @param pkc context of the operation to abort.
  */
 void
-GNUNET_FS_publish_ksk_cancel(struct GNUNET_FS_PublishKskContext *pkc)
+GNUNET_FS_publish_ksk_cancel (struct GNUNET_FS_PublishKskContext *pkc)
 {
   if (NULL != pkc->ksk_task)
-    {
-      GNUNET_SCHEDULER_cancel(pkc->ksk_task);
-      pkc->ksk_task = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (pkc->ksk_task);
+    pkc->ksk_task = NULL;
+  }
   if (NULL != pkc->uc)
-    {
-      GNUNET_FS_publish_ublock_cancel_(pkc->uc);
-      pkc->uc = NULL;
-    }
+  {
+    GNUNET_FS_publish_ublock_cancel_ (pkc->uc);
+    pkc->uc = NULL;
+  }
   if (NULL != pkc->dsh)
-    {
-      GNUNET_DATASTORE_disconnect(pkc->dsh, GNUNET_NO);
-      pkc->dsh = NULL;
-    }
-  GNUNET_CONTAINER_meta_data_destroy(pkc->meta);
-  GNUNET_FS_uri_destroy(pkc->ksk_uri);
-  GNUNET_FS_uri_destroy(pkc->uri);
-  GNUNET_free(pkc);
+  {
+    GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+    pkc->dsh = NULL;
+  }
+  GNUNET_CONTAINER_meta_data_destroy (pkc->meta);
+  GNUNET_FS_uri_destroy (pkc->ksk_uri);
+  GNUNET_FS_uri_destroy (pkc->uri);
+  GNUNET_free (pkc);
 }