luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 22:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

girparser: Move <doc> handling to passthrough

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=693040
This commit is contained in:
Jasper St. Pierre 2013-01-31 22:59:23 -05:00
parent 259c10f787
commit 37791c8267
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
girparser.c
View File

@ -95,7 +95,6 @@ typedef enum
STATE_ALIAS, /* 30 */
STATE_TYPE,
STATE_ATTRIBUTE,
STATE_DOC,
STATE_PASSTHROUGH
} ParseState;
@ -2116,22 +2115,6 @@ end_type (ParseContext *ctx)
}
}
static gboolean
start_doc (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
ParseContext *ctx,
GError **error)
{
if (strcmp (element_name, "doc") != 0)
return FALSE;
state_switch (ctx, STATE_DOC);
return TRUE;
}
static gboolean
start_attribute (GMarkupParseContext *context,
const gchar *element_name,
@ -2765,9 +2748,12 @@ start_element_handler (GMarkupParseContext *context,
attribute_names, attribute_values,
ctx, error))
goto out;
else if (start_doc (context, element_name, attribute_names,
attribute_values, ctx, error))
goto out;
if (strcmp (element_name, "doc") == 0)
{
state_switch (ctx, STATE_PASSTHROUGH);
ctx->unknown_depth = 1;
goto out;
}
break;
case 'e':
@ -3413,13 +3399,6 @@ end_element_handler (GMarkupParseContext *context,
}
break;
case STATE_DOC:
if (strcmp ("doc", element_name) == 0)
{
state_switch (ctx, ctx->prev_state);
}
break;
case STATE_PASSTHROUGH:
ctx->unknown_depth -= 1;
g_assert (ctx->unknown_depth >= 0);