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

[gnunet]

Author: grothoff
Date: 2010-02-26 12:55:36 +0100 (Fri, 26 Feb 2010)
New Revision: 10448

Modified:
   gnunet/src/fs/fs_test_lib_data.conf
   gnunet/src/fs/gnunet-service-fs.c
Log:
fix

Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2010-02-26 11:37:50 UTC (rev 10447)
+++ gnunet/src/fs/fs_test_lib_data.conf 2010-02-26 11:55:36 UTC (rev 10448)
@@ -47,7 +47,7 @@
 HOSTNAME = localhost
 DEBUG = YES
 PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
+BINARY = /home/grothoff/bin/gnunet-service-fs
 #PREFIX = xterm -e gdb -x cmd --args 
 
 [testing]

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-02-26 11:37:50 UTC (rev 10447)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-02-26 11:55:36 UTC (rev 10448)
@@ -78,7 +78,7 @@
 
 
 /**
- * Information we keep for each pending reply.  The
+ * Information we keep for each pending message (GET/PUT).  The
  * actual message follows at the end of this struct.
  */
 struct PendingMessage
@@ -842,7 +842,7 @@
   struct ClientResponseMessage *creply;
 
   if (client == NULL)
-    return; /* huh? is this allowed? */
+    return;
   prev = NULL;
   pos = client_list;
   while ( (NULL != pos) &&
@@ -1463,7 +1463,7 @@
                             GNUNET_PEER_Id tpid)
 {
   struct PendingRequest *pr = cls;
-
+  
   switch (pr->type)
     {
     case GNUNET_DATASTORE_BLOCKTYPE_DBLOCK:
@@ -1955,13 +1955,13 @@
   GNUNET_HashCode mhash;
   GNUNET_HashCode query;
   
-  pr->drq = NULL;
   if (NULL == key)
     {
 #if DEBUG_FS
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Done processing local replies, forwarding request to other 
peers.\n");
 #endif
+      pr->drq = NULL;
       if (pr->client_request_list != NULL)
        GNUNET_SERVER_receive_done 
(pr->client_request_list->client_list->client, 
                                    GNUNET_YES);