Attachment 160603 Details for Bug 240191 – glib2 patch

[patch] glib2 patch

gmk_err.diff (text/plain), 3.27 KB, created by Stas Sergeev on 2007-08-03 13:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stas Sergeev

Created: 2007-08-03 13:00:08 UTC

Size: 3.27 KB

patch

obsolete

>--- glib-2.12.13/glib/galias.h.old	2007-07-16 23:09:00.000000000 +0400
>+++ glib-2.12.13/glib/galias.h	2007-08-03 15:17:05.000000000 +0400
>@@ -1548,6 +1548,9 @@
> extern __typeof (g_markup_escape_text) IA__g_markup_escape_text __attribute((visibility("hidden")));
> #define g_markup_escape_text IA__g_markup_escape_text
> 
>+extern __typeof (g_markup_escape_text_errcheck) IA__g_markup_escape_text_errcheck __attribute((visibility("hidden")));
>+#define g_markup_escape_text_errcheck IA__g_markup_escape_text_errcheck
>+
> extern __typeof (g_markup_parse_context_end_parse) IA__g_markup_parse_context_end_parse __attribute((visibility("hidden")));
> #define g_markup_parse_context_end_parse IA__g_markup_parse_context_end_parse
> 
>--- glib-2.12.13/glib/galiasdef.c.old	2007-07-16 23:09:00.000000000 +0400
>+++ glib-2.12.13/glib/galiasdef.c	2007-08-03 16:00:53.000000000 +0400
>@@ -1548,9 +1548,12 @@
> #undef g_markup_error_quark 
> extern __typeof (g_markup_error_quark) g_markup_error_quark __attribute((alias("IA__g_markup_error_quark"), visibility("default")));
> 
>-#undef g_markup_escape_text 
>+#undef g_markup_escape_text
> extern __typeof (g_markup_escape_text) g_markup_escape_text __attribute((alias("IA__g_markup_escape_text"), visibility("default")));
> 
>+#undef g_markup_escape_text_errcheck
>+extern __typeof (g_markup_escape_text_errcheck) g_markup_escape_text_errcheck __attribute((alias("IA__g_markup_escape_text_errcheck"), visibility("default")));
>+
> #undef g_markup_parse_context_end_parse 
> extern __typeof (g_markup_parse_context_end_parse) g_markup_parse_context_end_parse __attribute((alias("IA__g_markup_parse_context_end_parse"), visibility("default")));
> 
>--- glib-2.12.13/glib/gmarkup.c.old	2007-07-16 22:57:12.000000000 +0400
>+++ glib-2.12.13/glib/gmarkup.c	2007-08-03 15:24:51.000000000 +0400
>@@ -1958,11 +1958,11 @@
>  **/
> gchar*
> g_markup_escape_text (const gchar *text,
>-                      gssize       length)  
>+                      gssize       length)
> {
>   GString *str;
> 
>-  g_return_val_if_fail (text != NULL, NULL);
>+  g_return_val_if_fail (text && g_utf8_validate(text, length, NULL), NULL);
> 
>   if (length < 0)
>     length = strlen (text);
>@@ -1974,6 +1974,23 @@
>   return g_string_free (str, FALSE);
> }
> 
>+gchar*
>+g_markup_escape_text_errcheck (const gchar *text,
>+                      gssize length,
>+                      GError **error)
>+{
>+  g_return_val_if_fail (text != NULL, NULL);
>+
>+  if (!g_utf8_validate(text, length, NULL)) {
>+	g_set_error (error, G_MARKUP_ERROR,
>+                         G_MARKUP_ERROR_BAD_UTF8,
>+                         _("Invalid UTF-8 encoded text"));
>+        return NULL;
>+  }
>+
>+  return g_markup_escape_text(text, length);
>+}
>+
> /**
>  * find_conversion:
>  * @format: a printf-style format string
>--- glib-2.12.13/glib/gmarkup.h.old	2007-07-16 22:57:12.000000000 +0400
>+++ glib-2.12.13/glib/gmarkup.h	2007-08-03 16:44:23.000000000 +0400
>@@ -117,7 +117,10 @@
> 
> /* useful when saving */
> gchar* g_markup_escape_text (const gchar *text,
>-                             gssize       length);  
>+                             gssize       length);
>+gchar* g_markup_escape_text_errcheck (const gchar *text,
>+                             gssize length,
>+                             GError **error);
> 
> gchar *g_markup_printf_escaped (const char *format,
> 				...) G_GNUC_PRINTF (1, 2);

Actions: View | Diff

Attachments on bug 240191: 154758 | 154759 | 154764 | 154766 | 160603 | 160604 | 160606 | 161640