From: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Sun, 10 Jun 2018 20:49:47 +0000 (+0000)
Subject: Fix wrong format strings in various places
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~182^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10b2f6540a32f24fe11d2e87a9ac21f1e1ae0762;p=gtk4.git

Fix wrong format strings in various places
---

diff --git a/demos/gtk-demo/event_axes.c b/demos/gtk-demo/event_axes.c
index 8794000597..5335d30614 100644
--- a/demos/gtk-demo/event_axes.c
+++ b/demos/gtk-demo/event_axes.c
@@ -444,7 +444,7 @@ draw_device_info (GtkWidget        *widget,
       g_string_append_printf (string, "\nTool: %s", tool_type);
 
       if (serial != 0)
-        g_string_append_printf (string, ", Serial: %lx", serial);
+        g_string_append_printf (string, ", Serial: %" G_GINT64_MODIFIER "x", serial);
     }
 
   cairo_move_to (cr, 10, *y);
diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index 6774d6cb3b..2675746408 100644
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -1028,7 +1028,7 @@ process_retrieve (GdkWin32ClipboardThreadRetrieve *retr)
   stream = g_memory_input_stream_new_from_data (data, data_len, g_free);
   g_object_set_data (stream, "gdk-clipboard-stream-contenttype", pair->contentformat);
 
-  GDK_NOTE (CLIPBOARD, g_printerr ("%s: reading clipboard data from a %lu-byte buffer\n",
+  GDK_NOTE (CLIPBOARD, g_printerr ("reading clipboard data from a %" G_GSIZE_FORMAT "-byte buffer\n",
                                    data_len));
   send_input_stream (retr->parent.item_type,
                      retr->parent.opaque_task,
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index f0e6def13d..a1d38da790 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -1929,7 +1929,7 @@ gdk_win32_surface_get_geometry (GdkSurface *window,
       if (height)
 	*height = (rect.bottom - rect.top) / impl->surface_scale;
 
-      GDK_NOTE (MISC, g_print ("gdk_win32_surface_get_geometry: %p: %ldx%ld@%+ld%\n",
+      GDK_NOTE (MISC, g_print ("gdk_win32_surface_get_geometry: %p: %ldx%ld@%+ld%+ld\n",
 			       GDK_SURFACE_HWND (window),
 			       (rect.right - rect.left) / impl->surface_scale,
 			       (rect.bottom - rect.top) / impl->surface_scale,
@@ -2019,7 +2019,7 @@ gdk_win32_surface_get_frame_extents (GdkSurface    *window,
   rect->x = r.left / impl->surface_scale + _gdk_offset_x;
   rect->y = r.top / impl->surface_scale + _gdk_offset_y;
 
-  GDK_NOTE (MISC, g_print ("gdk_surface_get_frame_extents: %p: %ldx%ld@%+ld%+ld\n",
+  GDK_NOTE (MISC, g_print ("gdk_surface_get_frame_extents: %p: %dx%d@%+d%+d\n",
                            GDK_SURFACE_HWND (window),
                            rect->width,
                            rect->height,
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index 3f6c4c70d0..2a2c980ce4 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -217,9 +217,9 @@ gsk_gl_driver_end_frame (GskGLDriver *self)
 
 #ifdef G_ENABLE_DEBUG
   GSK_NOTE (OPENGL,
-            g_message ("Textures created: %ld\n"
-                     " Textures reused: %ld\n"
-                     " Surface uploads: %ld",
+            g_message ("Textures created: %" G_GINT64_FORMAT "\n"
+                     " Textures reused: %" G_GINT64_FORMAT "\n"
+                     " Surface uploads: %" G_GINT64_FORMAT,
                      gsk_profiler_counter_get (self->profiler, self->counters.created_textures),
                      gsk_profiler_counter_get (self->profiler, self->counters.reused_textures),
                      gsk_profiler_counter_get (self->profiler, self->counters.surface_uploads)));
diff --git a/gsk/gskprofiler.c b/gsk/gskprofiler.c
index 2a09702826..253a0b6282 100644
--- a/gsk/gskprofiler.c
+++ b/gsk/gskprofiler.c
@@ -503,7 +503,7 @@ gsk_profiler_append_timers (GskProfiler *profiler,
       if (timer->n_samples > 1)
         {
           timer->avg_value = timer->avg_value / timer->n_samples;
-          g_string_append_printf (buffer, " Min: %.2f Avg: %.2f Max: %.2f (%ld samples)",
+          g_string_append_printf (buffer, " Min: %.2f Avg: %.2f Max: %.2f (%" G_GINT64_FORMAT " samples)",
                                   (double) timer->min_value / scale,
                                   (double) timer->avg_value / scale,
                                   (double) timer->max_value / scale,