diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-25 18:19:00 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-25 18:19:00 +0100 |
| commit | c3cdce4e0f733922ec151723c8b4d112ee40ca9d (patch) | |
| tree | 46153ba75bf0171868baf551ae2f10799662c2e9 /src/xine-utils | |
| parent | 09d56dfc0728f7a5dc80760c839f9818c8b80a57 (diff) | |
| parent | ad65ce16f4583a1ecdf3d3a507a7991c208d6c0c (diff) | |
| download | xine-lib-c3cdce4e0f733922ec151723c8b4d112ee40ca9d.tar.gz xine-lib-c3cdce4e0f733922ec151723c8b4d112ee40ca9d.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/xine-utils')
| -rw-r--r-- | src/xine-utils/xmllexer.c | 15 | ||||
| -rw-r--r-- | src/xine-utils/xmlparser.c | 4 |
2 files changed, 17 insertions, 2 deletions
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) { 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): |