1 files changed, 2 insertions, 6 deletions

diff --git a/src/service/peerstore/peerstore_api.c b/src/service/peerstore/peerstore_api.c
index 8770c36e4..481f4c6bb 100644
--- a/src/service/peerstore/peerstore_api.c
+++ b/src/service/peerstore/peerstore_api.c
@@ -1086,19 +1086,17 @@ GNUNET_PEERSTORE_watch (struct GNUNET_PEERSTORE_Handle *h,
                         GNUNET_PEERSTORE_Processor callback,
                         void *callback_cls)
 {
-  struct GNUNET_PEERSTORE_IterateContext *ic;
   struct GNUNET_PEERSTORE_WatchContext *wc;
 
   wc = GNUNET_new (struct GNUNET_PEERSTORE_WatchContext);
   wc->callback = callback;
   wc->callback_cls = callback_cls;
   wc->h = h;
-  wc->ic = ic;
   wc->key = key;
   wc->peer = peer;
   wc->sub_system = sub_system;
 
-  ic = GNUNET_PEERSTORE_iterate (h,
+  wc->ic = GNUNET_PEERSTORE_iterate (h,
                                  sub_system,
                                  peer,
                                  key,
@@ -1121,7 +1119,6 @@ hello_updated (void *cls,
 {
   struct GNUNET_PEERSTORE_NotifyContext *nc = cls;
   const struct GNUNET_MessageHeader *hello;
-  struct GNUNET_HELLO_Builder *builder;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "hello_updated\n");
@@ -1136,7 +1133,6 @@ hello_updated (void *cls,
   if (NULL == record)
     return;
   hello = record->value;
-  builder = GNUNET_HELLO_builder_from_msg (hello);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "hello_updated with expired %s and size %u for peer %s\n",
               GNUNET_STRINGS_absolute_time_to_string (GNUNET_HELLO_builder_get_expiration_time (hello)),
@@ -1319,7 +1315,7 @@ GNUNET_PEERSTORE_hello_add (struct GNUNET_PEERSTORE_Handle *h,
 {
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (msg);
   struct GNUNET_PEERSTORE_StoreHelloContext *huc;
-  struct GNUNET_PeerIdentity *pid;
+  const struct GNUNET_PeerIdentity *pid;
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
   struct GNUNET_TIME_Absolute hello_exp =
     GNUNET_HELLO_builder_get_expiration_time (msg);