[GNUnet-SVN] r10447 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-02-26 12:37:50 +0100 (Fri, 26 Feb 2010)
New Revision: 10447

Modified:
   gnunet/src/fs/fs_test_lib_data.conf
   gnunet/src/fs/gnunet-service-fs_drq.c
   gnunet/src/fs/test_gnunet_service_fs_p2p.c
Log:
reorder

Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2010-02-26 11:37:38 UTC (rev 10446)
+++ gnunet/src/fs/fs_test_lib_data.conf 2010-02-26 11:37:50 UTC (rev 10447)
@@ -46,7 +46,7 @@
 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 
 

Modified: gnunet/src/fs/gnunet-service-fs_drq.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_drq.c       2010-02-26 11:37:38 UTC (rev 
10446)
+++ gnunet/src/fs/gnunet-service-fs_drq.c       2010-02-26 11:37:50 UTC (rev 
10447)
@@ -324,10 +324,11 @@
 {
   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
     {

Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c  2010-02-26 11:37:38 UTC (rev 
10446)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c  2010-02-26 11:37:50 UTC (rev 
10447)
@@ -51,13 +51,13 @@
 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);
 }