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

[gnunet]

Author: otarabai
Date: 2014-06-11 13:54:30 +0200 (Wed, 11 Jun 2014)
New Revision: 33651

Modified:
   gnunet/src/peerstore/
   gnunet/src/peerstore/gnunet-service-peerstore.c
   gnunet/src/peerstore/peerstore_api.c
Log:
peerstore: minor fixes


Index: gnunet/src/peerstore
===================================================================
--- gnunet/src/peerstore        2014-06-11 11:31:32 UTC (rev 33650)
+++ gnunet/src/peerstore        2014-06-11 11:54:30 UTC (rev 33651)

Property changes on: gnunet/src/peerstore
___________________________________________________________________
Modified: svn:ignore
## -8,5 +8,4 ##
 test_peerstore_api_watch
 test_peerstore_api_store
 test_peerstore_api_iterate
-test_peerstore_stress_store
-
+perf_peerstore_store
Modified: gnunet/src/peerstore/gnunet-service-peerstore.c
===================================================================
--- gnunet/src/peerstore/gnunet-service-peerstore.c     2014-06-11 11:31:32 UTC 
(rev 33650)
+++ gnunet/src/peerstore/gnunet-service-peerstore.c     2014-06-11 11:54:30 UTC 
(rev 33651)
@@ -75,9 +75,16 @@
     GNUNET_free (db_lib_name);
     db_lib_name = NULL;
   }
-  GNUNET_SERVER_notification_context_destroy(nc);
-  GNUNET_CONTAINER_multihashmap_destroy(watchers);
-  watchers = NULL;
+  if(NULL != nc)
+  {
+    GNUNET_SERVER_notification_context_destroy(nc);
+    nc = NULL;
+  }
+  if(NULL != watchers)
+  {
+    GNUNET_CONTAINER_multihashmap_destroy(watchers);
+    watchers = NULL;
+  }
   GNUNET_SCHEDULER_shutdown();
 }
 
@@ -395,10 +402,8 @@
   if(NULL == db)
   {
          GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Could not load database 
backend `%s'\n"), db_lib_name);
-         /* FIXME:
-          * error handling required, otherwise you try to access db
-          * in message handlers like handle_store ...
-          *   if(GNUNET_OK != db->store_record(db->cls, ... */
+         GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+         return;
   }
   else
   {

Modified: gnunet/src/peerstore/peerstore_api.c
===================================================================
--- gnunet/src/peerstore/peerstore_api.c        2014-06-11 11:31:32 UTC (rev 
33650)
+++ gnunet/src/peerstore/peerstore_api.c        2014-06-11 11:54:30 UTC (rev 
33651)
@@ -712,7 +712,7 @@
   if(NULL == msg)
   {
     LOG(GNUNET_ERROR_TYPE_ERROR,
-        "Problem receiving a watch response, no way to determine which 
request.\n");
+        _("Problem receiving a watch response, no way to determine which 
request.\n"));
     reconnect(h);
     return;
   }