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

[gnunet]

Author: grothoff
Date: 2013-03-29 15:33:42 +0100 (Fri, 29 Mar 2013)
New Revision: 26651

Modified:
   gnunet/src/fs/test_fs_search.c
   gnunet/src/fs/test_fs_search_persistence.c
   gnunet/src/fs/test_fs_search_probes.c
Log:
-fix shutdown order

Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c      2013-03-28 16:47:02 UTC (rev 26650)
+++ gnunet/src/fs/test_fs_search.c      2013-03-29 14:33:42 UTC (rev 26651)
@@ -72,16 +72,16 @@
 {
   fprintf (stderr,
           "Timeout\n");
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
   if (NULL != publish)
   {
     GNUNET_FS_publish_stop (publish);
     publish = NULL;
   }
-  if (NULL != search)
-  {
-    GNUNET_FS_search_stop (search);
-    search = NULL;
-  }
   err = 1;
 }
 

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2013-03-28 16:47:02 UTC (rev 
26650)
+++ gnunet/src/fs/test_fs_search_persistence.c  2013-03-29 14:33:42 UTC (rev 
26651)
@@ -64,16 +64,16 @@
 {
   fprintf (stderr,
           "Timeout\n");
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
   if (NULL != publish)
   {
     GNUNET_FS_publish_stop (publish);
     publish = NULL;
   }
-  if (NULL != search)
-  {
-    GNUNET_FS_search_stop (search);
-    search = NULL;
-  }
   err = 1;
 }
 

Modified: gnunet/src/fs/test_fs_search_probes.c
===================================================================
--- gnunet/src/fs/test_fs_search_probes.c       2013-03-28 16:47:02 UTC (rev 
26650)
+++ gnunet/src/fs/test_fs_search_probes.c       2013-03-29 14:33:42 UTC (rev 
26651)
@@ -63,16 +63,16 @@
 {
   fprintf (stderr,
           "Timeout\n");
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
   if (NULL != publish)
   {
     GNUNET_FS_publish_stop (publish);
     publish = NULL;
   }
-  if (NULL != search)
-  {
-    GNUNET_FS_search_stop (search);
-    search = NULL;
-  }
   err = 1;
 }