-use const in peerstore callback

7 files changed, 78 insertions, 69 deletions

diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index f8ec631b9..bdd93e63a 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -239,7 +239,9 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
  * @return #GNUNET_YES to continue iteration
  */
 static int
-record_iterator (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+record_iterator (void *cls,
+                 const struct GNUNET_PEERSTORE_Record *record,
+                 const char *emsg)
 {
   struct GNUNET_PEERSTORE_Record *cls_record = cls;
   struct StoreRecordMessage *srm;
@@ -410,7 +412,7 @@ handle_iterate (void *cls, struct GNUNET_SERVER_Client *client,
 
 
 /**
- * Continuation of store_record called by the peerstore plugin 
+ * Continuation of store_record called by the peerstore plugin
  *
  * @param cls closure
  * @param success result
diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index ef134feef..6644464ec 100644
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -30,10 +30,11 @@
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message carrying a PEERSTORE record message
  */
-    struct StoreRecordMessage
+struct StoreRecordMessage
 {
 
   /**
@@ -47,15 +48,20 @@ GNUNET_NETWORK_STRUCT_BEGIN
   uint16_t peer_set GNUNET_PACKED;
 
   /**
+   * Size of the sub_system string
+   * Allocated at position 0 after this struct
+   */
+  uint16_t sub_system_size GNUNET_PACKED;
+
+  /**
    * Peer Identity
    */
   struct GNUNET_PeerIdentity peer;
 
   /**
-   * Size of the sub_system string
-   * Allocated at position 0 after this struct
+   * Expiry time of entry
    */
-  uint16_t sub_system_size GNUNET_PACKED;
+  struct GNUNET_TIME_Absolute expiry GNUNET_PACKED;
 
   /**
    * Size of the key string
@@ -70,18 +76,14 @@ GNUNET_NETWORK_STRUCT_BEGIN
   uint16_t value_size GNUNET_PACKED;
 
   /**
-   * Expiry time of entry
-   */
-  struct GNUNET_TIME_Absolute expiry GNUNET_PACKED;
-
-  /**
    * Options, needed only in case of a
    * store operation
    */
-  enum GNUNET_PEERSTORE_StoreOption options GNUNET_PACKED;
+  uint32_t /* enum GNUNET_PEERSTORE_StoreOption */ options GNUNET_PACKED;
 
 };
 
+
 /**
  * Message carrying record key hash
  */
@@ -94,6 +96,11 @@ struct StoreKeyHashMessage
   struct GNUNET_MessageHeader header;
 
   /**
+   * Always 0, for alignment.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
+  /**
    * Hash of a record key
    */
   struct GNUNET_HashCode keyhash;
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 90594f73a..46f170a23 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C)
+     (C) 2013-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -17,11 +17,11 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file peerstore/peerstore_api.c
  * @brief API for peerstore
  * @author Omar Tarabai
+ * @author Christian Grothoff
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -292,15 +292,30 @@ reconnect (struct GNUNET_PEERSTORE_Handle *h);
  * @param cls a 'struct GNUNET_PEERSTORE_WatchContext *'
  */
 static void
-watch_request_sent (void *cls);
+watch_request_sent (void *cls)
+{
+  struct GNUNET_PEERSTORE_WatchContext *wc = cls;
+
+  wc->request_sent = GNUNET_YES;
+  wc->ev = NULL;
+}
+
 
 /**
  * Callback after MQ envelope is sent
  *
- * @param cls a 'struct GNUNET_PEERSTORE_IterateContext *'
+ * @param cls a `struct GNUNET_PEERSTORE_IterateContext *`
  */
 static void
-iterate_request_sent (void *cls);
+iterate_request_sent (void *cls)
+{
+  struct GNUNET_PEERSTORE_IterateContext *ic = cls;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Iterate request sent to service.\n");
+  ic->iterating = GNUNET_YES;
+  ic->ev = NULL;
+}
 
 
 /**
@@ -724,7 +739,6 @@ handle_iterate_result (void *cls,
   callback_cls = ic->callback_cls;
   if (NULL == msg)              /* Connection error */
   {
-
     if (NULL != callback)
       callback (callback_cls, NULL,
                 _("Error communicating with `PEERSTORE' service."));
@@ -759,23 +773,6 @@ handle_iterate_result (void *cls,
 
 
 /**
- * Callback after MQ envelope is sent
- *
- * @param cls a `struct GNUNET_PEERSTORE_IterateContext *`
- */
-static void
-iterate_request_sent (void *cls)
-{
-  struct GNUNET_PEERSTORE_IterateContext *ic = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Iterate request sent to service.\n");
-  ic->iterating = GNUNET_YES;
-  ic->ev = NULL;
-}
-
-
-/**
  * Called when the iterate request is timedout
  *
  * @param cls a `struct GNUNET_PEERSTORE_IterateContext *`
@@ -923,21 +920,6 @@ handle_watch_result (void *cls, const struct GNUNET_MessageHeader *msg)
 
 
 /**
- * Callback after MQ envelope is sent
- *
- * @param cls a `struct GNUNET_PEERSTORE_WatchContext *`
- */
-static void
-watch_request_sent (void *cls)
-{
-  struct GNUNET_PEERSTORE_WatchContext *wc = cls;
-
-  wc->request_sent = GNUNET_YES;
-  wc->ev = NULL;
-}
-
-
-/**
  * Cancel a watch request
  *
  * @param wc handle to the watch request
diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c
index e97699fe2..ad7c70195 100644
--- a/src/peerstore/perf_peerstore_store.c
+++ b/src/peerstore/perf_peerstore_store.c
@@ -37,9 +37,9 @@ static struct GNUNET_PeerIdentity p;
 static char *k = "test_peerstore_stress_key";
 static char *v = "test_peerstore_stress_val";
 
-int count = 0;
+static int count = 0;
 
-void
+static void
 disconnect ()
 {
   if (NULL != h)
@@ -48,7 +48,7 @@ disconnect ()
 }
 
 
-void
+static void
 store ()
 {
   GNUNET_PEERSTORE_store (h, ss, &p, k, v, strlen (v) + 1,
@@ -61,7 +61,9 @@ store ()
 
 
 static int
-watch_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+watch_cb (void *cls,
+          const struct GNUNET_PEERSTORE_Record *record,
+          const char *emsg)
 {
   GNUNET_assert (NULL == emsg);
   if (STORES == count)
diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/peerstore/test_peerstore_api_iterate.c
index 626a020de..5952d45d1 100644
--- a/src/peerstore/test_peerstore_api_iterate.c
+++ b/src/peerstore/test_peerstore_api_iterate.c
@@ -39,8 +39,11 @@ static char *k3 = "test_peerstore_api_iterate_key3";
 static char *val = "test_peerstore_api_iterate_val";
 static int count = 0;
 
+
 static int
-iter3_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+iter3_cb (void *cls,
+          const struct GNUNET_PEERSTORE_Record *record,
+          const char *emsg)
 {
   if (NULL != emsg)
     return GNUNET_NO;
@@ -58,7 +61,9 @@ iter3_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
 
 
 static int
-iter2_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+iter2_cb (void *cls,
+          const struct GNUNET_PEERSTORE_Record *record,
+          const char *emsg)
 {
   if (NULL != emsg)
     return GNUNET_NO;
@@ -76,7 +81,9 @@ iter2_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
 
 
 static int
-iter1_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+iter1_cb (void *cls,
+          const struct GNUNET_PEERSTORE_Record *record,
+          const char *emsg)
 {
   if (NULL != emsg)
     return GNUNET_NO;
diff --git a/src/peerstore/test_peerstore_api_store.c b/src/peerstore/test_peerstore_api_store.c
index 06ad34756..794a2b048 100644
--- a/src/peerstore/test_peerstore_api_store.c
+++ b/src/peerstore/test_peerstore_api_store.c
@@ -37,10 +37,12 @@ static char *val1 = "test_peerstore_api_store_val1";
 static char *val2 = "test_peerstore_api_store_val2-";
 static char *val3 = "test_peerstore_api_store_val3--";
 
-int count = 0;
+static int count = 0;
 
-int
-test3_cont2 (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+static int
+test3_cont2 (void *cls,
+             const struct GNUNET_PEERSTORE_Record *record,
+             const char *emsg)
 {
   if (NULL != emsg)
     return GNUNET_NO;
@@ -83,8 +85,10 @@ test3 ()
 }
 
 
-int
-test2_cont2 (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+static int
+test2_cont2 (void *cls,
+             const struct GNUNET_PEERSTORE_Record *record,
+             const char *emsg)
 {
   if (NULL != emsg)
     return GNUNET_NO;
@@ -128,8 +132,10 @@ test2 ()
 }
 
 
-int
-test1_cont2 (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+static int
+test1_cont2 (void *cls,
+             const struct GNUNET_PEERSTORE_Record *record,
+             const char *emsg)
 {
   if (NULL != emsg)
     return GNUNET_NO;
@@ -172,7 +178,8 @@ test1 ()
 
 
 static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
   h = GNUNET_PEERSTORE_connect (cfg);
diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c
index 3803d72c1..8bd8328f8 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -26,9 +26,9 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
 
-int ok = 1;
+static int ok = 1;
 
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static struct GNUNET_PEERSTORE_Handle *h;
 
@@ -37,8 +37,10 @@ static struct GNUNET_PeerIdentity pid;
 static char *key = "test_peerstore_api_store_key";
 static char *val = "test_peerstore_api_store_val";
 
-int
-iterate_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+static int
+iterate_cb (void *cls,
+            const struct GNUNET_PEERSTORE_Record *record,
+            const char *emsg)
 {
   const char *rec_val;