fixing compiler warnings

5 files changed, 29 insertions, 22 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index c091f7fb..aca58d30 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -119,11 +119,9 @@ GCG_get_configuration ()
  * Task run on shutdown.
  *
  * @param cls unused
- * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   GCG_EGOS_shutdown ();
   GCG_ZONES_shutdown ();
@@ -155,11 +153,9 @@ gnunet_conversation_gtk_quit_cb (GObject *object,
  * is initialized.  Initializes up GTK and Glade.
  *
  * @param cls NULL
- * @param tc schedule context
  */
 static void
-run (void *cls,
-     const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls)
 {
   GtkWidget *main_window;
 
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 098e1931..8660ba90 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -2945,7 +2945,12 @@ mark_download_progress (struct DownloadEntry *de,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Marking download progress for DE=%p, %llu/%llu, %llu@%llu depth=%u\n",
-              de, completed, size, block_size, offset, depth);
+              de,
+              (unsigned long long) completed,
+              (unsigned long long) size,
+              (unsigned long long) block_size,
+              (unsigned long long) offset,
+              depth);
 
   if (NULL != de->sr->tab)
   {
@@ -3119,8 +3124,10 @@ setup_download (struct DownloadEntry *de,
                 struct SearchResult *sr,
                 uint32_t anonymity,
                 struct GNUNET_FS_DownloadContext *dc,
-                const struct GNUNET_FS_Uri *uri, const char *filename,
-                const struct GNUNET_CONTAINER_MetaData *meta, uint64_t size,
+                const struct GNUNET_FS_Uri *uri,
+                const char *filename,
+                const struct GNUNET_CONTAINER_MetaData *meta,
+                uint64_t size,
                 uint64_t completed)
 {
   GtkTreeIter iter;
@@ -3129,7 +3136,13 @@ setup_download (struct DownloadEntry *de,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Setting up download, initially DE=%p, PDE=%p for %p & %p into %llu/%llu `%s'\n",
-              de, pde, sr, dc, completed, size, filename);
+              de,
+              pde,
+              sr,
+              dc,
+              (unsigned long long) completed,
+              (unsigned long long) size,
+              filename);
   GNUNET_assert (NULL != uri);
   if (NULL == de)
   {
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 750e1810..2258b5bc 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -2123,7 +2123,7 @@ gnunet_namestore_gtk_pseu_entry_changed_cb (GtkEditable *editable,
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "New Pseudonym is `%s' %u\n",
+              "New Pseudonym is `%s'\n",
               pseu);
   GNUNET_free_non_null (current_pseudonym);
   if ( (NULL != pseu) &&
@@ -2370,9 +2370,11 @@ zone_iteration_proc (void *cls,
       continue;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Record %u: type %u flags %u expiration %llu data_size %u\n",
-                c, rd[c].record_type, rd[c].flags,
-                rd[c].expiration_time,
-                rd[c].data_size);
+                c,
+                rd[c].record_type,
+                rd[c].flags,
+                (unsigned long long) rd[c].expiration_time,
+                (unsigned int) rd[c].data_size);
 
     /* Set public toggle */
     is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE);
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index f5a3f6f2..5733ae09 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -499,11 +499,9 @@ free_paths (void *cts,
  * Task run on shutdown.
  *
  * @param cts unused
- * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cts,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cts)
 {
   GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
@@ -1570,12 +1568,10 @@ query_tooltip_cb (GtkWidget *widget,
  * Actual main function run right after GNUnet's scheduler
  * is initialized.  Initializes up GTK and Glade.
  *
- * @param cts NULL
- * @param tc schedule context
+ * @param cts the main loop context
  */
 static void
-run (void *cts,
-     const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cts)
 {
   GtkWidget *main_window;
   GtkTreeView *tv;
diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index 0eef7e44..8ef66ac6 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -234,7 +234,7 @@ GNUNET_STATISTICS_GTK_quit_cb (GObject * object, gpointer user_data)
  * is initialized.  Initializes up GTK and Glade.
  */
 static void
-run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls)
 {
   GtkWidget *main_window;