From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 26 Feb 2010 11:37:50 +0000 (+0000)
Subject: reorder
X-Git-Tag: initial-import-from-subversion-38251~22605
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b333e0a2a78936459278a8d4a98e83216350e430;p=oweals%2Fgnunet.git

reorder
---

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index d62ee8c98..7ca0166a1 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -46,7 +46,7 @@ DEBUG = YES
 PORT = 43471
 HOSTNAME = localhost
 DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs
 #PREFIX = xterm -e gdb -x cmd --args 
 
diff --git a/src/fs/gnunet-service-fs_drq.c b/src/fs/gnunet-service-fs_drq.c
index 29b2dca82..fd5614606 100644
--- a/src/fs/gnunet-service-fs_drq.c
+++ b/src/fs/gnunet-service-fs_drq.c
@@ -324,10 +324,11 @@ get_iterator (void *cls,
 {
   struct GetClosure *gc = cls;
 
-  if (gc->iter == NULL)
+  if (gc->iter == NULL) 
     {
       /* stop the iteration */
-      GNUNET_DATASTORE_get_next (dsh, GNUNET_NO);
+      if (key != NULL)
+	GNUNET_DATASTORE_get_next (dsh, GNUNET_NO);
     }
   else
     {
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 3a4f08249..715d5b442 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -51,13 +51,13 @@ static void
 do_stop (void *cls,
 	 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  GNUNET_FS_TEST_daemons_stop (sched,
+			       NUM_DAEMONS,
+			       daemons);
   GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Finished download, shutting down\n",
 	      (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_daemons_stop (sched,
-			       NUM_DAEMONS,
-			       daemons);
 }