diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-02 21:51:16 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-02 21:51:16 +0200 |
| commit | c81f80094b17f05a3e526893a9a21cc9fea87638 (patch) | |
| tree | 8e023928924b4708aa484cf2ff56e50d644be3bc /src/xine-utils | |
| parent | 427e9e3beba63e05f5d158336e767bcf55f8c3ae (diff) | |
| parent | ad65ce16f4583a1ecdf3d3a507a7991c208d6c0c (diff) | |
| download | xine-lib-c81f80094b17f05a3e526893a9a21cc9fea87638.tar.gz xine-lib-c81f80094b17f05a3e526893a9a21cc9fea87638.tar.bz2 | |
Merge changes.
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): |