-only trigger check config if we actually need it

[oweals/gnunet.git] / src / fs / fs_publish_ublock.c

diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index 1cba7a4fcc8cb87610955edab95646ec0cffbc7a..7de9ea689df0222abb31fbbb851507da8e759532 100644 (file)
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010, 2012, 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -121,9 +121,9 @@ struct GNUNET_FS_PublishUblockContext
  * Continuation of #GNUNET_FS_publish_ublock_().
  *
  * @param cls closure of type "struct GNUNET_FS_PublishUblockContext*"
- * @param success GNUNET_SYSERR on failure (including timeout/queue drop)
- *                GNUNET_NO if content was already there
- *                GNUNET_YES (or other positive value) on success
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue drop)
+ *                #GNUNET_NO if content was already there
+ *                #GNUNET_YES (or other positive value) on success
  * @param min_expiration minimum expiration time required for 0-priority content to be stored
  *                by the datacache at this time, zero for unknown, forever if we have no
  *                space for 0-priority content
@@ -147,11 +147,9 @@ ublock_put_cont (void *cls,
  * Run the continuation.
  *
  * @param cls the `struct GNUNET_FS_PublishUblockContext *`
- * @param tc scheduler context
  */
 static void
-run_cont (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_cont (void *cls)
 {
   struct GNUNET_FS_PublishUblockContext *uc = cls;
 
@@ -285,7 +283,9 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
   if (NULL != dsh)
   {
     uc->qre =
-      GNUNET_DATASTORE_put (dsh, 0, &query,
+      GNUNET_DATASTORE_put (dsh,
+                            0,
+                            &query,
                             ulen + slen + mdsize + sizeof (struct UBlock),
                             ub_enc,
                             GNUNET_BLOCK_TYPE_FS_UBLOCK,
@@ -294,7 +294,6 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
                             bo->replication_level,
                             bo->expiration_time,
                             -2, 1,
-                            GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                             &ublock_put_cont, uc);
   }
   else