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

revert previous commit - uses APIs from glib 2.1

Browse Source 
2002-05-19  Jacob Berkman  <jacob@ximian.com>

	* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
	commit - uses APIs from glib 2.1
This commit is contained in:
Jacob Berkman 2002-05-19 05:41:46 +00:00 committed by Jacob Berkman
parent 366425b7c4
commit 3fbae004d9
8 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2002-05-19 Jacob Berkman <jacob@ximian.com>
* glib/gmarkup.c (g_markup_parse_context_parse): revert previous
commit - uses APIs from glib 2.1
2002-05-19 Matthias Clasen <maclas@gmx.de> 2002-05-19 Matthias Clasen <maclas@gmx.de>
* tests/markups/fail-36.gmarkup: * tests/markups/fail-36.gmarkup:

23
glib/gmarkup.c
View File

@ -97,7 +97,6 @@ struct _GMarkupParseContext
guint document_empty : 1; guint document_empty : 1;
guint parsing : 1; guint parsing : 1;
gint balance;
}; };
/** /**
@ -155,8 +154,6 @@ g_markup_parse_context_new (const GMarkupParser *parser,
context->document_empty = TRUE; context->document_empty = TRUE;
context->parsing = FALSE; context->parsing = FALSE;
context->balance = 0;
return context; return context;
} }
@ -725,10 +722,8 @@ find_current_text_end (GMarkupParseContext *context)
p = context->current_text; p = context->current_text;
next = g_utf8_find_next_char (p, end); next = g_utf8_find_next_char (p, end);
while (next && *next) while (next)
{ {
if (p == next)
next++;
p = next; p = next;
next = g_utf8_find_next_char (p, end); next = g_utf8_find_next_char (p, end);
} }
@ -968,7 +963,6 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
const gchar *openangle = "<"; const gchar *openangle = "<";
add_to_partial (context, openangle, openangle + 1); add_to_partial (context, openangle, openangle + 1);
context->start = context->iter; context->start = context->iter;
context->balance = 1;
context->state = STATE_INSIDE_PASSTHROUGH; context->state = STATE_INSIDE_PASSTHROUGH;
} }
else if (*context->iter == '/') else if (*context->iter == '/')
@ -1504,23 +1498,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
/* Possible next state: AFTER_CLOSE_ANGLE */ /* Possible next state: AFTER_CLOSE_ANGLE */
do do
{ {
if (*context->iter == '<')
context->balance++;
if (*context->iter == '>') if (*context->iter == '>')
{
context->balance--;
add_to_partial (context, context->start, context->iter);
context->start = context->iter;
if ((g_str_has_prefix (context->partial_chunk->str, "<?")
&& g_str_has_suffix (context->partial_chunk->str, "?")) ||
(g_str_has_prefix (context->partial_chunk->str, "<!--")
&& g_str_has_suffix (context->partial_chunk->str, "--")) ||
(g_str_has_prefix (context->partial_chunk->str, "<![CDATA[")
&& g_str_has_suffix (context->partial_chunk->str, "]]")) ||
(g_str_has_prefix (context->partial_chunk->str, "<!DOCTYPE")
&& context->balance == 0))
break; break;
}
} }
while (advance_char (context)); while (advance_char (context));