devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: Altered the way the parser handles asterisks in the tag argument specifiers

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26459 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-06-02 05:27:37 +00:00
parent 0dfd418b31
commit f02a2446d3
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
utils/themeeditor/skin_parser.c
View file

@ -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;

2
utils/themeeditor/tag_table.h
View file

@ -272,7 +272,7 @@ enum skin_token_type {
* number before the character. For instance, the string...
* 2s
* will specify two strings. An asterisk (*) at the beginning of the
* string will specify that either all or none of the optional
* string will specify that you may choose to omit all arguments
*
*/
struct tag_info