From 326c127679bb27c7e894ddebf9db49158744fd38 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 21 Apr 2007 18:12:01 +0100 Subject: Fix comments - '>' and '?>' were reversed. --- src/xine-utils/xmlparser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xine-utils') diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 47096705a..363c6381f 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -413,7 +413,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r } break; - /* > expected */ + /* ?> expected */ case 8: switch (res) { case (T_TI_STOP): @@ -425,7 +425,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r } break; - /* ?> expected */ + /* > expected */ case 9: switch (res) { case (T_M_STOP_1): -- cgit v1.2.3 From 5bdc44a5e1ab86562d344a1e14373527406bf914 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 21 Apr 2007 22:05:50 +0100 Subject: Handle single-quoted attributes in XML. --- src/xine-utils/xmllexer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/xine-utils') diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index 575c37611..754a006f9 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -120,6 +120,10 @@ int lexer_get_token(char * tok, int tok_size) { state = 7; break; + case '\'': /* " */ + state = 12; + break; + case '-': state = 10; tok[tok_pos] = c; @@ -322,6 +326,17 @@ int lexer_get_token(char * tok, int tok_size) { } break; + /* T_STRING (single quotes) */ + case 12: + tok[tok_pos] = c; + lexbuf_pos++; + if (c == '\'') { /* " */ + tok[tok_pos] = '\0'; /* FIXME */ + return T_STRING; + } + tok_pos++; + break; + /* IDENT */ case 100: switch (c) { -- cgit v1.2.3