2 files changed, 7 insertions, 7 deletions

diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index ffe973df4..63b64eaf6 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -534,8 +534,8 @@ void store_trigger_receive(void *cls, const char *emsg)
     cont_cls = sc->cont_cls;
     GNUNET_PEERSTORE_store_cancel (sc);
     reconnect (h);
-    if (NULL != sc->cont)
-      sc->cont (sc->cont_cls, emsg);
+    if (NULL != cont)
+      cont (cont_cls, emsg);
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Waiting for response from `%s' service.\n",
diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index 4598bbf24..6aa6edf3b 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -117,16 +117,16 @@ get_record_and_call_iterator (struct Plugin *plugin,
 {
   int ret;
   int sret;
-  struct GNUNET_PeerIdentity *pid;
-  char *sub_system;
-  void *value;
+  const struct GNUNET_PeerIdentity *pid;
+  const char *sub_system;
+  const void *value;
   size_t value_size;
 
   ret = GNUNET_NO;
   if (SQLITE_ROW == (sret = sqlite3_step (stmt)))
   {
     pid = sqlite3_column_blob(stmt, 0);
-    sub_system = sqlite3_column_text(stmt, 1);
+    sub_system = (const char*) sqlite3_column_text(stmt, 1);
     value = sqlite3_column_blob(stmt, 2);
     value_size = sqlite3_column_bytes(stmt, 2);
     if (NULL != iter)
@@ -165,7 +165,7 @@ peerstore_sqlite_iterate_records (void *cls,
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
-  int err;
+  int err = 0;
 
   if(NULL == sub_system && NULL == peer)
     stmt = plugin->select_peerstoredata;