diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-17 18:48:07 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-17 18:48:07 +0000 |
| commit | 926093783c7367a23291063bcafc199aee2b12eb (patch) | |
| tree | 4165a6c04853d315293b39be646acef485684cc1 /src/xine-utils/xmlparser.c | |
| parent | 44a9e76d27c08c715df5c79f2ad3308eeadef205 (diff) | |
| parent | 8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29 (diff) | |
| download | xine-lib-926093783c7367a23291063bcafc199aee2b12eb.tar.gz xine-lib-926093783c7367a23291063bcafc199aee2b12eb.tar.bz2 | |
Merge from 1.2 main.
Diffstat (limited to 'src/xine-utils/xmlparser.c')
| -rw-r--r-- | src/xine-utils/xmlparser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 7ae0626eb..9d29ca8e8 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -399,7 +399,7 @@ static int xml_parser_get_node_internal (xml_parser_t *xml_parser, current_subtree = subtree; } else { current_subtree->next = subtree; - current_subtree = subtree; + current_subtree = subtree; } state = STATE_IDLE; break; @@ -766,7 +766,7 @@ const char *xml_parser_get_property (const xml_node_t *node, const char *name) { return NULL; } -int xml_parser_get_property_int (const xml_node_t *node, const char *name, +int xml_parser_get_property_int (const xml_node_t *node, const char *name, int def_value) { const char *v; @@ -783,7 +783,7 @@ int xml_parser_get_property_int (const xml_node_t *node, const char *name, return ret; } -int xml_parser_get_property_bool (const xml_node_t *node, const char *name, +int xml_parser_get_property_bool (const xml_node_t *node, const char *name, int def_value) { const char *v; |