fixing compiler warnings

5 files changed, 12 insertions, 7 deletions

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index e8b632a3f..42677af8a 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -2096,7 +2096,7 @@ create_download_context (struct GNUNET_FS_Handle *h,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting download %p, %u bytes at offset %llu\n",
               dc,
-              (unsigned long long) length,
+              (unsigned int) length,
               (unsigned long long) offset);
   dc->h = h;
   dc->uri = GNUNET_FS_uri_dup (uri);
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 07f4a5653..69876b8b5 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -204,7 +204,9 @@ write_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig)
   if (NULL == wh)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to open `%s' for writing: %s\n"), STRERROR (errno));
+                _("Failed to open `%s' for writing: %s\n"),
+                fn,
+                STRERROR (errno));
     GNUNET_free (fn);
     return;
   }
@@ -226,7 +228,9 @@ write_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig)
   }
 END:
   if (GNUNET_OK != GNUNET_BIO_write_close (wh))
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to write `%s': %s\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to write `%s': %s\n"),
+                fn,
                 STRERROR (errno));
   GNUNET_free (fn);
 }
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 80843006e..530a7ac9b 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -508,8 +508,9 @@ block_proc (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Indexing block `%s' for offset %llu with index size %u\n",
-                GNUNET_h2s (&chk->query), (unsigned long long) offset,
-                sizeof (struct OnDemandBlock));
+                GNUNET_h2s (&chk->query),
+                (unsigned long long) offset,
+                (unsigned int) sizeof (struct OnDemandBlock));
     odb.offset = GNUNET_htonll (offset);
     odb.file_id = p->data.file.file_id;
     GNUNET_assert (pc->qre == NULL);
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c
index 2706aea30..e61442aa3 100644
--- a/src/fs/gnunet-service-fs_lc.c
+++ b/src/fs/gnunet-service-fs_lc.c
@@ -279,7 +279,7 @@ client_response_handler (void *cls,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Queued reply to query `%s' for local client\n",
-              GNUNET_h2s (&prd->query), (unsigned int) prd->type);
+              GNUNET_h2s (&prd->query));
   if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index a76a3827c..d7a15fad6 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -296,7 +296,7 @@ transmit_content (struct MigrationReadyPeer *peer,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Asking for transmission of %u bytes to %s for migration\n",
-              msize,
+              (unsigned int) msize,
               GNUNET_i2s (GSF_connected_peer_get_identity2_(peer->peer)));
   peer->th = GSF_peer_transmit_ (peer->peer,
                                  GNUNET_NO, 0 /* priority */ ,