fix logging

diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index 7fa6707c9afd240c68d05b7a23359118d15954aa..f83f8c21132cc51113bb1a4a7fe1dda1cc77cf07 100644 (file)
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -195,7 +195,7 @@ progress_cb (void *cls,
       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:

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 07852b4ba292454fc259e5ef9c3d558f5d34810c..0a49f9a37773fea52882f8ce575fea58e83c6c8a 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -988,7 +988,7 @@ transmit_to_peer (void *cls,
                                                   &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 @@ target_reservation_cb (void *cls,
   /* 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 @@ process_local_reply (void *cls,
   
   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