[GNUnet-SVN] r36097 - in gnunet/src: datastore include

[gnunet]

Author: grothoff
Date: 2015-07-18 15:33:10 +0200 (Sat, 18 Jul 2015)
New Revision: 36097

Modified:
   gnunet/src/datastore/gnunet-service-datastore.c
   gnunet/src/datastore/perf_plugin_datastore.c
   gnunet/src/datastore/test_plugin_datastore.c
   gnunet/src/include/gnunet_datastore_plugin.h
Log:
-adding missing 'const' decls, fixing indentation / doxygen a bit

Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c     2015-07-18 00:03:06 UTC 
(rev 36096)
+++ gnunet/src/datastore/gnunet-service-datastore.c     2015-07-18 13:33:10 UTC 
(rev 36097)
@@ -829,9 +829,21 @@
 };
 
 
+/**
+ * Put continuation.
+ *
+ * @param cls closure
+ * @param key key for the item stored
+ * @param size size of the item stored
+ * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param msg error message on error
+ */
 static void
-put_continuation (void *cls, const struct GNUNET_HashCode *key, uint32_t size,
-                  int status, char *msg)
+put_continuation (void *cls, 
+                 const struct GNUNET_HashCode *key, 
+                 uint32_t size,
+                  int status,
+                 const char *msg)
 {
   struct GNUNET_SERVER_Client *client = cls;
 
@@ -877,7 +889,9 @@
 
 
 static void
-check_present_continuation (void *cls, int status, char *msg)
+check_present_continuation (void *cls, 
+                           int status, 
+                           const char *msg)
 {
   struct GNUNET_SERVER_Client *client = cls;
 
@@ -890,7 +904,7 @@
  * Function that will check if the given datastore entry
  * matches the put and if none match executes the put.
  *
- * @param cls closure, pointer to the client (of type 'struct PutContext').
+ * @param cls closure, pointer to the client (of type `struct PutContext`).
  * @param key key for the content
  * @param size number of bytes in data
  * @param data content stored
@@ -900,14 +914,18 @@
  * @param expiration expiration time for the content
  * @param uid unique identifier for the datum;
  *        maybe 0 if no unique identifier is available
- *
- * @return GNUNET_OK usually
- *         GNUNET_NO to delete the item
+ * @return #GNUNET_OK usually
+ *         #GNUNET_NO to delete the item
  */
 static int
-check_present (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
-               const void *data, enum GNUNET_BLOCK_Type type, uint32_t 
priority,
-               uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+check_present (void *cls, 
+              const struct GNUNET_HashCode *key,
+              uint32_t size,
+               const void *data, 
+              enum GNUNET_BLOCK_Type type, 
+              uint32_t priority,
+               uint32_t anonymity, 
+              struct GNUNET_TIME_Absolute expiration,
                uint64_t uid)
 {
   struct PutContext *pc = cls;
@@ -932,10 +950,12 @@
     if ((ntohl (dm->priority) > 0) ||
         (GNUNET_TIME_absolute_ntoh (dm->expiration).abs_value_us >
          expiration.abs_value_us))
-      plugin->api->update (plugin->api->cls, uid,
+      plugin->api->update (plugin->api->cls, 
+                          uid,
                            (int32_t) ntohl (dm->priority),
                            GNUNET_TIME_absolute_ntoh (dm->expiration),
-                           check_present_continuation, pc->client);
+                           &check_present_continuation,
+                          pc->client);
     else
     {
       transmit_status (pc->client, GNUNET_NO, NULL);
@@ -1008,8 +1028,13 @@
     pc->client = client;
     GNUNET_SERVER_client_keep (client);
     memcpy (&pc[1], dm, size + sizeof (struct DataMessage));
-    plugin->api->get_key (plugin->api->cls, 0, &dm->key, &vhash,
-                          ntohl (dm->type), &check_present, pc);
+    plugin->api->get_key (plugin->api->cls,
+                         0, 
+                         &dm->key, 
+                         &vhash,
+                          ntohl (dm->type),
+                         &check_present, 
+                         pc);
     return;
   }
   execute_put (client, dm);
@@ -1069,7 +1094,9 @@
 
 
 static void
-update_continuation (void *cls, int status, char *msg)
+update_continuation (void *cls, 
+                    int status, 
+                    const char *msg)
 {
   struct GNUNET_SERVER_Client *client = cls;
 

Modified: gnunet/src/datastore/perf_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore.c        2015-07-18 00:03:06 UTC 
(rev 36096)
+++ gnunet/src/datastore/perf_plugin_datastore.c        2015-07-18 13:33:10 UTC 
(rev 36097)
@@ -99,12 +99,25 @@
 
 
 static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+test (void *cls, 
+      const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
+/**
+ * Put continuation.
+ *
+ * @param cls closure
+ * @param key key for the item stored
+ * @param size size of the item stored
+ * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param msg error message on error
+ */
 static void
-put_continuation (void *cls, const struct GNUNET_HashCode *key,
-                  uint32_t size, int status, char *msg)
+put_continuation (void *cls,
+                 const struct GNUNET_HashCode *key,
+                  uint32_t size, 
+                 int status, 
+                 const char *msg)
 {
   struct CpsRunContext *crc = cls;
 

Modified: gnunet/src/datastore/test_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/test_plugin_datastore.c        2015-07-18 00:03:06 UTC 
(rev 36096)
+++ gnunet/src/datastore/test_plugin_datastore.c        2015-07-18 13:33:10 UTC 
(rev 36097)
@@ -84,12 +84,25 @@
 
 
 static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+test (void *cls,
+      const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
+/**
+ * Put continuation.
+ *
+ * @param cls closure
+ * @param key key for the item stored
+ * @param size size of the item stored
+ * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param msg error message on error
+ */
 static void
-put_continuation (void *cls, const struct GNUNET_HashCode *key,
-                  uint32_t size, int status, char *msg)
+put_continuation (void *cls, 
+                 const struct GNUNET_HashCode *key,
+                  uint32_t size, 
+                 int status, 
+                 const char *msg)
 {
   struct CpsRunContext *crc = cls;
   static unsigned long long os;
@@ -238,7 +251,9 @@
 
 
 static void
-update_continuation (void *cls, int status, char *msg)
+update_continuation (void *cls, 
+                    int status,
+                    const char *msg)
 {
   struct CpsRunContext *crc = cls;
 
@@ -285,8 +300,12 @@
                        GNUNET_BLOCK_TYPE_ANY, &iterate_one_shot, crc);
     break;
   case RP_UPDATE:
-    crc->api->update (crc->api->cls, guid, 1, GNUNET_TIME_UNIT_ZERO_ABS,
-                      update_continuation, crc);
+    crc->api->update (crc->api->cls,
+                     guid,
+                     1, 
+                     GNUNET_TIME_UNIT_ZERO_ABS,
+                      &update_continuation, 
+                     crc);
     break;
 
   case RP_ITER_ZERO:

Modified: gnunet/src/include/gnunet_datastore_plugin.h
===================================================================
--- gnunet/src/include/gnunet_datastore_plugin.h        2015-07-18 00:03:06 UTC 
(rev 36096)
+++ gnunet/src/include/gnunet_datastore_plugin.h        2015-07-18 13:33:10 UTC 
(rev 36097)
@@ -48,7 +48,9 @@
  * @param delta change in disk utilization,
  *        0 for "reset to empty"
  */
-typedef void (*DiskUtilizationChange) (void *cls, int delta);
+typedef void 
+(*GNUNET_DATASTORE_DiskUtilizationChange) (void *cls, 
+                                          int delta);
 
 
 /**
@@ -66,7 +68,7 @@
   /**
    * Function to call on disk utilization change.
    */
-  DiskUtilizationChange duc;
+  GNUNET_DATASTORE_DiskUtilizationChange duc;
 
   /**
    * Closure.
@@ -91,13 +93,18 @@
  * @return #GNUNET_OK to keep the item
  *         #GNUNET_NO to delete the item
  */
-typedef int (*PluginDatumProcessor) (void *cls, const struct GNUNET_HashCode * 
key,
-                                     uint32_t size, const void *data,
-                                     enum GNUNET_BLOCK_Type type,
-                                     uint32_t priority, uint32_t anonymity,
-                                     struct GNUNET_TIME_Absolute expiration,
-                                     uint64_t uid);
+typedef int 
+(*PluginDatumProcessor) (void *cls, 
+                        const struct GNUNET_HashCode *key,
+                        uint32_t size, 
+                        const void *data,
+                        enum GNUNET_BLOCK_Type type,
+                        uint32_t priority, 
+                        uint32_t anonymity,
+                        struct GNUNET_TIME_Absolute expiration,
+                        uint64_t uid);
 
+
 /**
  * Get an estimate of how much space the database is
  * currently using.
@@ -109,7 +116,9 @@
  * @param estimate location to store estimate
  * @return number of bytes used on disk
  */
-typedef void (*PluginEstimateSize) (void *cls, unsigned long long *estimate);
+typedef void
+(*PluginEstimateSize) (void *cls,
+                      unsigned long long *estimate);
 
 
 /**
@@ -118,11 +127,15 @@
  * @param cls closure
  * @param key key for the item stored
  * @param size size of the item stored
- * @param status GNUNET_OK or GNUNET_SYSERROR
+ * @param status #GNUNET_OK or #GNUNET_SYSERROR
  * @param msg error message on error
  */
-typedef void (*PluginPutCont) (void *cls, const struct GNUNET_HashCode *key,
-                               uint32_t size, int status, char *msg);
+typedef void 
+(*PluginPutCont) (void *cls, 
+                 const struct GNUNET_HashCode *key,
+                 uint32_t size,
+                 int status, 
+                 const char *msg);
 
 
 /**
@@ -140,15 +153,19 @@
  * @param replication replication-level for the content
  * @param expiration expiration time for the content
  * @param cont continuation called with success or failure status
- * @param cont_cls continuation closure
+ * @param cont_cls continuation closure for @a cont
  */
-typedef void (*PluginPut) (void *cls, const struct GNUNET_HashCode * key,
-                           uint32_t size,
-                           const void *data, enum GNUNET_BLOCK_Type type,
-                           uint32_t priority, uint32_t anonymity,
-                           uint32_t replication,
-                           struct GNUNET_TIME_Absolute expiration,
-                           PluginPutCont cont, void *cont_cls);
+typedef void 
+(*PluginPut) (void *cls, const struct GNUNET_HashCode *key,
+             uint32_t size,
+             const void *data,
+             enum GNUNET_BLOCK_Type type,
+             uint32_t priority, 
+             uint32_t anonymity,
+             uint32_t replication,
+             struct GNUNET_TIME_Absolute expiration,
+             PluginPutCont cont, 
+             void *cont_cls);
 
 
 /**
@@ -158,9 +175,10 @@
  * @param key key in the data store, if NULL iteration is finished
  * @param count how many values are stored under this key in the datastore
  */
-typedef void (*PluginKeyProcessor) (void *cls,
-                                   const struct GNUNET_HashCode *key,
-                                   unsigned int count);
+typedef void 
+(*PluginKeyProcessor) (void *cls,
+                      const struct GNUNET_HashCode *key,
+                      unsigned int count);
 
 
 /**
@@ -170,8 +188,9 @@
  * @param proc function to call on each key
  * @param proc_cls closure for @a proc
  */
-typedef void (*PluginGetKeys) (void *cls,
-                              PluginKeyProcessor proc, void *proc_cls);
+typedef void
+(*PluginGetKeys) (void *cls,
+                 PluginKeyProcessor proc, void *proc_cls);
 
 
 /**
@@ -192,11 +211,14 @@
  *        proc should be called with NULL if there is no result
  * @param proc_cls closure for @a proc
  */
-typedef void (*PluginGetKey) (void *cls, uint64_t offset,
-                              const struct GNUNET_HashCode * key,
-                              const struct GNUNET_HashCode * vhash,
-                              enum GNUNET_BLOCK_Type type,
-                              PluginDatumProcessor proc, void *proc_cls);
+typedef void 
+(*PluginGetKey) (void *cls, 
+                uint64_t offset,
+                const struct GNUNET_HashCode *key,
+                const struct GNUNET_HashCode *vhash,
+                enum GNUNET_BLOCK_Type type,
+                PluginDatumProcessor proc,
+                void *proc_cls);
 
 
 /**
@@ -209,8 +231,10 @@
  * @param proc function to call the value (once only).
  * @param proc_cls closure for @a proc
  */
-typedef void (*PluginGetRandom) (void *cls, PluginDatumProcessor proc,
-                                 void *proc_cls);
+typedef void 
+(*PluginGetRandom) (void *cls, 
+                   PluginDatumProcessor proc,
+                   void *proc_cls);
 
 
 /**
@@ -217,10 +241,13 @@
  * Update continuation.
  *
  * @param cls closure
- * @param status GNUNET_OK or GNUNET_SYSERROR
+ * @param status #GNUNET_OK or #GNUNET_SYSERROR
  * @param msg error message on error
  */
-typedef void (*PluginUpdateCont) (void *cls, int status, char *msg);
+typedef void 
+(*PluginUpdateCont) (void *cls, 
+                    int status,
+                    const char *msg);
 
 
 /**
@@ -243,9 +270,13 @@
  * @param cont continuation called with success or failure status
  * @param cons_cls continuation closure
  */
-typedef void (*PluginUpdate) (void *cls, uint64_t uid, int delta,
-                              struct GNUNET_TIME_Absolute expire,
-                              PluginUpdateCont cont, void *cont_cls);
+typedef void 
+(*PluginUpdate) (void *cls,
+                uint64_t uid,
+                int delta,
+                struct GNUNET_TIME_Absolute expire,
+                PluginUpdateCont cont, 
+                void *cont_cls);
 
 
 /**
@@ -260,9 +291,12 @@
  * @param proc function to call on the matching value
  * @param proc_cls closure for @a proc
  */
-typedef void (*PluginGetType) (void *cls, uint64_t offset,
-                               enum GNUNET_BLOCK_Type type,
-                               PluginDatumProcessor proc, void *proc_cls);
+typedef void 
+(*PluginGetType) (void *cls,
+                 uint64_t offset,
+                 enum GNUNET_BLOCK_Type type,
+                 PluginDatumProcessor proc,
+                 void *proc_cls);
 
 
 /**
@@ -270,10 +304,10 @@
  *
  * @param cls closure
  */
-typedef void (*PluginDrop) (void *cls);
+typedef void 
+(*PluginDrop) (void *cls);
 
 
-
 /**
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.