From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 19 Jan 2013 19:30:05 +0000 (-0500)
Subject: Fix build with -Werror=format
X-Git-Tag: 2.35.6~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e9d028b96b3e19902a40b930418a0ec3e30ccfc;p=platform%2Fupstream%2Fglib.git

Fix build with -Werror=format

There were a few places in gmarkup.c where we were giving
pointer differences when integers are expected. Fix that
by explicitly casting to int.

https://bugzilla.gnome.org/show_bug.cgi?id=692079
---

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index bf7c008..552773f 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -684,7 +684,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                                         "inside a character reference "
                                         "(&#234; for example) - perhaps "
                                         "the digit is too large"),
-                                      end - from, from);
+                                      (int)(end - from), from);
                   return FALSE;
                 }
               else if (*end != ';')
@@ -719,7 +719,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                                           from, G_MARKUP_ERROR_PARSE,
                                           _("Character reference '%-.*s' does not "
                                             "encode a permitted character"),
-                                          end - from, from);
+                                          (int)(end - from), from);
                       return FALSE;
                     }
                 }
@@ -764,7 +764,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                     set_unescape_error (context, error,
                                         from, G_MARKUP_ERROR_PARSE,
                                         _("Entity name '%-.*s' is not known"),
-                                        end-from, from);
+                                        (int)(end - from), from);
                   else
                     set_unescape_error (context, error,
                                         from, G_MARKUP_ERROR_PARSE,