[GNUnet-SVN] r37135 - in gnunet-gtk/src: conversation fs namestore peerinfo statistics

[gnunet]

Author: grothoff
Date: 2016-05-06 16:48:47 +0200 (Fri, 06 May 2016)
New Revision: 37135

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
   gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
   gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
   gnunet-gtk/src/statistics/gnunet-statistics-gtk.c
Log:
fixing compiler warnings

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2016-05-06 
14:44:08 UTC (rev 37134)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2016-05-06 
14:48:47 UTC (rev 37135)
@@ -119,11 +119,9 @@
  * 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 @@
  * 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;
 

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2016-05-06 14:44:08 UTC 
(rev 37134)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2016-05-06 14:48:47 UTC 
(rev 37135)
@@ -2945,7 +2945,12 @@
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Marking download progress for DE=%p, %llu/%llu, address@hidden 
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 @@
                 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 @@
 
   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)
   {

Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c     2016-05-06 14:44:08 UTC 
(rev 37134)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c     2016-05-06 14:48:47 UTC 
(rev 37135)
@@ -2123,7 +2123,7 @@
     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 @@
       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);

Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2016-05-06 14:44:08 UTC 
(rev 37134)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2016-05-06 14:48:47 UTC 
(rev 37135)
@@ -499,11 +499,9 @@
  * 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 @@
  * 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;

Modified: gnunet-gtk/src/statistics/gnunet-statistics-gtk.c
===================================================================
--- gnunet-gtk/src/statistics/gnunet-statistics-gtk.c   2016-05-06 14:44:08 UTC 
(rev 37134)
+++ gnunet-gtk/src/statistics/gnunet-statistics-gtk.c   2016-05-06 14:48:47 UTC 
(rev 37135)
@@ -234,7 +234,7 @@
  * is initialized.  Initializes up GTK and Glade.
  */
 static void
-run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls)
 {
   GtkWidget *main_window;