Fix error reporting in gmarkup

This commit is contained in:
Matthias Clasen 2005-03-06 20:26:28 +00:00
parent e165ec765b
commit 0d0698b9cc
5 changed files with 35 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2005-03-06 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c: Add G_GNUC_PRINTF attribute
to set_error.
(g_markup_parse_context_end_parse): Fix an
error message, noticed by Tim Janik.
2005-02-24 Tor Lillqvist <tml@novell.com> 2005-02-24 Tor Lillqvist <tml@novell.com>
* glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute * glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute

View File

@ -1,3 +1,10 @@
2005-03-06 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c: Add G_GNUC_PRINTF attribute
to set_error.
(g_markup_parse_context_end_parse): Fix an
error message, noticed by Tim Janik.
2005-02-24 Tor Lillqvist <tml@novell.com> 2005-02-24 Tor Lillqvist <tml@novell.com>
* glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute * glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute

View File

@ -1,3 +1,10 @@
2005-03-06 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c: Add G_GNUC_PRINTF attribute
to set_error.
(g_markup_parse_context_end_parse): Fix an
error message, noticed by Tim Janik.
2005-02-24 Tor Lillqvist <tml@novell.com> 2005-02-24 Tor Lillqvist <tml@novell.com>
* glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute * glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute

View File

@ -1,3 +1,10 @@
2005-03-06 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c: Add G_GNUC_PRINTF attribute
to set_error.
(g_markup_parse_context_end_parse): Fix an
error message, noticed by Tim Janik.
2005-02-24 Tor Lillqvist <tml@novell.com> 2005-02-24 Tor Lillqvist <tml@novell.com>
* glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute * glib/Makefile.am (BUILT_EXTRA_DIST): Don't distribute

View File

@ -206,6 +206,12 @@ mark_error (GMarkupParseContext *context,
(*context->parser->error) (context, error, context->user_data); (*context->parser->error) (context, error, context->user_data);
} }
static void set_error (GMarkupParseContext *context,
GError **error,
GMarkupError code,
const gchar *format,
...) G_GNUC_PRINTF (4, 5);
static void static void
set_error (GMarkupParseContext *context, set_error (GMarkupParseContext *context,
GError **error, GError **error,
@ -1801,7 +1807,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
case STATE_INSIDE_CLOSE_TAG_NAME: case STATE_INSIDE_CLOSE_TAG_NAME:
set_error (context, error, G_MARKUP_ERROR_PARSE, set_error (context, error, G_MARKUP_ERROR_PARSE,
_("Document ended unexpectedly inside the close tag for " _("Document ended unexpectedly inside the close tag for "
"element '%s'"), current_element); "element '%s'"), current_element (context));
break; break;
case STATE_INSIDE_PASSTHROUGH: case STATE_INSIDE_PASSTHROUGH: