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

[gnunet]

Author: grothoff
Date: 2010-02-27 12:01:57 +0100 (Sat, 27 Feb 2010)
New Revision: 10454

Modified:
   gnunet/src/fs/fs_test_lib.c
   gnunet/src/fs/gnunet-service-fs.c
Log:
fix logging

Modified: gnunet/src/fs/fs_test_lib.c
===================================================================
--- gnunet/src/fs/fs_test_lib.c 2010-02-27 10:52:09 UTC (rev 10453)
+++ gnunet/src/fs/fs_test_lib.c 2010-02-27 11:01:57 UTC (rev 10454)
@@ -195,7 +195,7 @@
       if (daemon->verbose)
        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                    "Download at %llu/%llu bytes\n",
-                   (unsigned long long) 
info->value.download.specifics.progress.offset,
+                   (unsigned long long) info->value.download.completed,
                    (unsigned long long) info->value.download.size);
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-02-27 10:52:09 UTC (rev 10453)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-02-27 11:01:57 UTC (rev 10454)
@@ -988,7 +988,7 @@
                                                   &transmit_to_peer,
                                                   pm);
     }
-#if DEBUG_FS
+#if DEBUG_FS > 2
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Transmitting %u bytes to peer %u.\n",
              msize,
@@ -1273,7 +1273,8 @@
   /* build message and insert message into priority queue */
 #if DEBUG_FS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Forwarding request to `%4s'!\n",
+             "Forwarding request `%s' to `%4s'!\n",
+             GNUNET_h2s (&pr->query),
              GNUNET_i2s (peer));
 #endif
   k = 0;
@@ -1960,7 +1961,7 @@
   
   if (NULL == key)
     {
-#if DEBUG_FS
+#if DEBUG_FS > 1
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Done processing local replies, forwarding request to other 
peers.\n");
 #endif