[GNUnet-SVN] r34833 - in gnunet/src: fs include

[gnunet]

Author: grothoff
Date: 2015-01-07 15:05:06 +0100 (Wed, 07 Jan 2015)
New Revision: 34833

Modified:
   gnunet/src/fs/fs_publish.c
   gnunet/src/include/gnunet_datastore_service.h
   gnunet/src/include/gnunet_service_lib.h
Log:
-simplify apis, doxygen

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2015-01-07 14:04:57 UTC (rev 34832)
+++ gnunet/src/fs/fs_publish.c  2015-01-07 14:05:06 UTC (rev 34833)
@@ -1366,8 +1366,6 @@
     ret->qre =
         GNUNET_DATASTORE_reserve (ret->dsh, ret->reserve_space,
                                   ret->reserve_entries,
-                                  UINT_MAX, UINT_MAX,
-                                  GNUNET_TIME_UNIT_FOREVER_REL,
                                   &finish_reserve,
                                   ret);
   }

Modified: gnunet/src/include/gnunet_datastore_service.h
===================================================================
--- gnunet/src/include/gnunet_datastore_service.h       2015-01-07 14:04:57 UTC 
(rev 34832)
+++ gnunet/src/include/gnunet_datastore_service.h       2015-01-07 14:05:06 UTC 
(rev 34833)
@@ -105,22 +105,17 @@
  * @param h handle to the datastore
  * @param amount how much space (in bytes) should be reserved (for content 
only)
  * @param entries how many entries will be created (to calculate per-entry 
overhead)
- * @param queue_priority ranking of this request in the priority queue
- * @param max_queue_size at what queue size should this request be dropped
- *        (if other requests of higher priority are in the queue)
- * @param timeout how long to wait at most for a response (or before dying in 
queue)
  * @param cont continuation to call when done; "success" will be set to
  *             a positive reservation value if space could be reserved.
- * @param cont_cls closure for cont
+ * @param cont_cls closure for @a cont
  * @return NULL if the entry was not queued, otherwise a handle that can be 
used to
  *         cancel; note that even if NULL is returned, the callback will be 
invoked
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h, uint64_t amount,
-                          uint32_t entries, unsigned int queue_priority,
-                          unsigned int max_queue_size,
-                          struct GNUNET_TIME_Relative timeout,
+GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
+                          uint64_t amount,
+                          uint32_t entries,
                           GNUNET_DATASTORE_ContinuationWithStatus cont,
                           void *cont_cls);
 

Modified: gnunet/src/include/gnunet_service_lib.h
===================================================================
--- gnunet/src/include/gnunet_service_lib.h     2015-01-07 14:04:57 UTC (rev 
34832)
+++ gnunet/src/include/gnunet_service_lib.h     2015-01-07 14:05:06 UTC (rev 
34833)
@@ -51,7 +51,7 @@
  *              addresses the server should bind to and listen on; the
  *              array will be NULL-terminated (on success)
  * @param addr_lens set (call by reference) to an array of the lengths
- *              of the respective 'struct sockaddr' struct in the @a addrs
+ *              of the respective `struct sockaddr` struct in the @a addrs
  *              array (on success)
  * @return number of addresses found on success,
  *              #GNUNET_SYSERR if the configuration
@@ -76,9 +76,10 @@
  * @param server the initialized server
  * @param cfg configuration to use
  */
-typedef void (*GNUNET_SERVICE_Main) (void *cls,
-                                     struct GNUNET_SERVER_Handle *server,
-                                     const struct GNUNET_CONFIGURATION_Handle 
*cfg);
+typedef void
+(*GNUNET_SERVICE_Main) (void *cls,
+                        struct GNUNET_SERVER_Handle *server,
+                        const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**