[GNUnet-SVN] r33261 - gnunet/src/peerstore

[gnunet]

Author: otarabai
Date: 2014-05-13 16:54:00 +0200 (Tue, 13 May 2014)
New Revision: 33261

Modified:
   gnunet/src/peerstore/peerstore_api.c
   gnunet/src/peerstore/plugin_peerstore_sqlite.c
Log:
warning fix


Modified: gnunet/src/peerstore/peerstore_api.c
===================================================================
--- gnunet/src/peerstore/peerstore_api.c        2014-05-13 14:28:03 UTC (rev 
33260)
+++ gnunet/src/peerstore/peerstore_api.c        2014-05-13 14:54:00 UTC (rev 
33261)
@@ -534,8 +534,8 @@
     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",

Modified: gnunet/src/peerstore/plugin_peerstore_sqlite.c
===================================================================
--- gnunet/src/peerstore/plugin_peerstore_sqlite.c      2014-05-13 14:28:03 UTC 
(rev 33260)
+++ gnunet/src/peerstore/plugin_peerstore_sqlite.c      2014-05-13 14:54:00 UTC 
(rev 33261)
@@ -117,16 +117,16 @@
 {
   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 @@
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
-  int err;
+  int err = 0;
 
   if(NULL == sub_system && NULL == peer)
     stmt = plugin->select_peerstoredata;