143561
From eddba1d6138b2f9542dd7f1f4e08a2ac0f35c21a Mon Sep 17 00:00:00 2001
143561
From: Kalev Lember <kalevlember@gmail.com>
143561
Date: Sun, 2 Jun 2013 10:35:39 +0200
143561
Subject: [PATCH] Fix -Wformat compiler warnings
143561
143561
These were treated as errors with gcc 4.8 because of the use of -Werror.
143561
143561
https://bugzilla.gnome.org/show_bug.cgi?id=701457
143561
---
143561
 src/disks/gducreatediskimagedialog.c  | 2 +-
143561
 src/disks/gdurestorediskimagedialog.c | 8 ++++----
143561
 2 files changed, 5 insertions(+), 5 deletions(-)
143561
143561
diff --git a/src/disks/gducreatediskimagedialog.c b/src/disks/gducreatediskimagedialog.c
143561
index 2817a89..8d1e092 100644
143561
--- a/src/disks/gducreatediskimagedialog.c
143561
+++ b/src/disks/gducreatediskimagedialog.c
143561
@@ -610,7 +610,7 @@ copy_span (int              fd,
143561
                                   error))
143561
     {
143561
       g_prefix_error (error,
143561
-                      "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ",
143561
+                      "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ",
143561
                       num_bytes_to_write,
143561
                       offset);
143561
       goto out;
143561
diff --git a/src/disks/gdurestorediskimagedialog.c b/src/disks/gdurestorediskimagedialog.c
143561
index abfc4f5..09171e4 100644
143561
--- a/src/disks/gdurestorediskimagedialog.c
143561
+++ b/src/disks/gdurestorediskimagedialog.c
143561
@@ -587,7 +587,7 @@ copy_thread_func (gpointer user_data)
143561
                                     &error))
143561
         {
143561
           g_prefix_error (&error,
143561
-                          "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ",
143561
+                          "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ",
143561
                           num_bytes_to_read,
143561
                           num_bytes_completed);
143561
           goto out;
143561
@@ -595,7 +595,7 @@ copy_thread_func (gpointer user_data)
143561
       if (num_bytes_read != num_bytes_to_read)
143561
         {
143561
           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
143561
-                       "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes",
143561
+                       "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes",
143561
                        num_bytes_read,
143561
                        num_bytes_completed,
143561
                        num_bytes_to_read);
143561
@@ -610,13 +610,13 @@ copy_thread_func (gpointer user_data)
143561
             goto copy_write_again;
143561
 
143561
           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
143561
-                       "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m",
143561
+                       "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m",
143561
                        num_bytes_read,
143561
                        num_bytes_completed);
143561
           goto out;
143561
         }
143561
 
143561
-      /*g_print ("copied %" G_GUINT64_FORMAT " bytes at offset %" G_GUINT64_FORMAT "\n",
143561
+      /*g_print ("copied %" G_GSIZE_FORMAT " bytes at offset %" G_GUINT64_FORMAT "\n",
143561
                (guint64) num_bytes_written,
143561
                num_bytes_completed);*/
143561
 
143561
-- 
143561
1.8.2.1
143561