diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-02 05:27:37 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-02 05:27:37 +0000 |
commit | f02a2446d3c05b824cbbb887834ce82a7cd8fe0b (patch) | |
tree | ff3a354c8f056d3e1accf38da152b8650560a71c | |
parent | 0dfd418b311e7501457404d1bd2298c7de3eeeff (diff) | |
download | rockbox-f02a2446d3c05b824cbbb887834ce82a7cd8fe0b.tar.gz rockbox-f02a2446d3c05b824cbbb887834ce82a7cd8fe0b.zip |
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
-rw-r--r-- | utils/themeeditor/skin_parser.c | 5 | ||||
-rw-r--r-- | utils/themeeditor/tag_table.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c index 8e4bc88e96..6902679bc1 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) | |||
410 | 410 | ||
411 | /* If this tag has no arguments, we can bail out now */ | 411 | /* If this tag has no arguments, we can bail out now */ |
412 | if(strlen(tag_args) == 0 | 412 | if(strlen(tag_args) == 0 |
413 | || (tag_args[0] == '|' && *cursor != ARGLISTOPENSYM)) | 413 | || (tag_args[0] == '|' && *cursor != ARGLISTOPENSYM) |
414 | || (star && *cursor != ARGLISTOPENSYM)) | ||
414 | { | 415 | { |
415 | *document = cursor; | 416 | *document = cursor; |
416 | return 1; | 417 | return 1; |
@@ -556,7 +557,7 @@ int skin_parse_tag(struct skin_element* element, char** document) | |||
556 | } | 557 | } |
557 | 558 | ||
558 | /* Checking for a premature end */ | 559 | /* Checking for a premature end */ |
559 | if(*tag_args != '\0' && !(optional && (!star || num_args == req_args))) | 560 | if(*tag_args != '\0' && !(optional && !star)) |
560 | { | 561 | { |
561 | skin_error(INSUFFICIENT_ARGS); | 562 | skin_error(INSUFFICIENT_ARGS); |
562 | return 0; | 563 | return 0; |
diff --git a/utils/themeeditor/tag_table.h b/utils/themeeditor/tag_table.h index 7f8d3a88ec..b09e85204d 100644 --- a/utils/themeeditor/tag_table.h +++ b/utils/themeeditor/tag_table.h | |||
@@ -272,7 +272,7 @@ enum skin_token_type { | |||
272 | * number before the character. For instance, the string... | 272 | * number before the character. For instance, the string... |
273 | * 2s | 273 | * 2s |
274 | * will specify two strings. An asterisk (*) at the beginning of the | 274 | * will specify two strings. An asterisk (*) at the beginning of the |
275 | * string will specify that either all or none of the optional | 275 | * string will specify that you may choose to omit all arguments |
276 | * | 276 | * |
277 | */ | 277 | */ |
278 | struct tag_info | 278 | struct tag_info |