summaryrefslogtreecommitdiff
path: root/utils/themeeditor/skin_parser.c
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-06-02 05:27:37 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-06-02 05:27:37 +0000
commitf02a2446d3c05b824cbbb887834ce82a7cd8fe0b (patch)
treeff3a354c8f056d3e1accf38da152b8650560a71c /utils/themeeditor/skin_parser.c
parent0dfd418b311e7501457404d1bd2298c7de3eeeff (diff)
downloadrockbox-f02a2446d3c05b824cbbb887834ce82a7cd8fe0b.zip
rockbox-f02a2446d3c05b824cbbb887834ce82a7cd8fe0b.tar.gz
rockbox-f02a2446d3c05b824cbbb887834ce82a7cd8fe0b.tar.bz2
rockbox-f02a2446d3c05b824cbbb887834ce82a7cd8fe0b.tar.xz
Theme Editor: Altered the way the parser handles asterisks in the tag argument specifiers
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26459 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/skin_parser.c')
-rw-r--r--utils/themeeditor/skin_parser.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c
index 8e4bc88..6902679 100644
--- a/utils/themeeditor/skin_parser.c
+++ b/utils/themeeditor/skin_parser.c
@@ -410,7 +410,8 @@ int skin_parse_tag(struct skin_element* element, char** document)
/* If this tag has no arguments, we can bail out now */
if(strlen(tag_args) == 0
- || (tag_args[0] == '|' && *cursor != ARGLISTOPENSYM))
+ || (tag_args[0] == '|' && *cursor != ARGLISTOPENSYM)
+ || (star && *cursor != ARGLISTOPENSYM))
{
*document = cursor;
return 1;
@@ -556,7 +557,7 @@ int skin_parse_tag(struct skin_element* element, char** document)
}
/* Checking for a premature end */
- if(*tag_args != '\0' && !(optional && (!star || num_args == req_args)))
+ if(*tag_args != '\0' && !(optional && !star))
{
skin_error(INSUFFICIENT_ARGS);
return 0;