diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-02 06:12:18 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-02 06:12:18 +0000 |
commit | 4003f35dc79c4678526d2ee3a510963713ce88b8 (patch) | |
tree | a5b82cdb81cb56b65f6b5f6a4a4284d5a32f94f0 /utils/themeeditor/skin_parser.c | |
parent | f16adb045a25bf6f7ac29a2f6c80b25f1a3d2613 (diff) | |
download | rockbox-4003f35dc79c4678526d2ee3a510963713ce88b8.tar.gz rockbox-4003f35dc79c4678526d2ee3a510963713ce88b8.zip |
Theme Editor: Removed the NEWLINE parse tree element
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26463 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/skin_parser.c')
-rw-r--r-- | utils/themeeditor/skin_parser.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c index 860970b7e7..9ff4f90115 100644 --- a/utils/themeeditor/skin_parser.c +++ b/utils/themeeditor/skin_parser.c | |||
@@ -49,7 +49,6 @@ int skin_parse_tag(struct skin_element* element, char** document); | |||
49 | int skin_parse_text(struct skin_element* element, char** document, | 49 | int skin_parse_text(struct skin_element* element, char** document, |
50 | int conditional); | 50 | int conditional); |
51 | int skin_parse_conditional(struct skin_element* element, char** document); | 51 | int skin_parse_conditional(struct skin_element* element, char** document); |
52 | int skin_parse_newline(struct skin_element* element, char** document); | ||
53 | int skin_parse_comment(struct skin_element* element, char** document); | 52 | int skin_parse_comment(struct skin_element* element, char** document); |
54 | struct skin_element* skin_parse_code_as_arg(char** document); | 53 | struct skin_element* skin_parse_code_as_arg(char** document); |
55 | 54 | ||
@@ -166,10 +165,7 @@ struct skin_element* skin_parse_viewport(char** document) | |||
166 | 165 | ||
167 | if(*cursor == '\n') | 166 | if(*cursor == '\n') |
168 | { | 167 | { |
169 | *to_write = skin_alloc_element(); | 168 | cursor++; |
170 | skin_parse_newline(*to_write, &cursor); | ||
171 | if(!last) | ||
172 | return NULL; | ||
173 | } | 169 | } |
174 | else if(sublines) | 170 | else if(sublines) |
175 | { | 171 | { |
@@ -705,28 +701,6 @@ int skin_parse_conditional(struct skin_element* element, char** document) | |||
705 | return 1; | 701 | return 1; |
706 | } | 702 | } |
707 | 703 | ||
708 | int skin_parse_newline(struct skin_element* element, char** document) | ||
709 | { | ||
710 | |||
711 | char* cursor = *document; | ||
712 | if(*cursor != '\n') | ||
713 | { | ||
714 | skin_error(NEWLINE_EXPECTED); | ||
715 | return 0; | ||
716 | } | ||
717 | cursor++; | ||
718 | |||
719 | /* Assembling a skin_element struct for a newline */ | ||
720 | element->type = NEWLINE; | ||
721 | element->line = skin_line; | ||
722 | skin_line++; | ||
723 | element->next = NULL; | ||
724 | |||
725 | *document = cursor; | ||
726 | |||
727 | return 1; | ||
728 | } | ||
729 | |||
730 | int skin_parse_comment(struct skin_element* element, char** document) | 704 | int skin_parse_comment(struct skin_element* element, char** document) |
731 | { | 705 | { |
732 | char* cursor = *document; | 706 | char* cursor = *document; |