A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

Correct spelling of 'seperate' in the skin parsing code - FS#11724 by Alexander Levin


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28485 a1c6a512-1295-4272-9138-f99709370657

+24 -24
+3 -3
lib/skin_parser/skin_debug.c
··· 85 85 case DECIMAL_EXPECTED: 86 86 error_message = "Expected decimal"; 87 87 break; 88 - case SEPERATOR_EXPECTED: 89 - error_message = "Expected argument seperator"; 88 + case SEPARATOR_EXPECTED: 89 + error_message = "Expected argument separator"; 90 90 break; 91 91 case CLOSE_EXPECTED: 92 92 error_message = "Expected list close"; 93 93 break; 94 94 case MULTILINE_EXPECTED: 95 - error_message = "Expected subline seperator"; 95 + error_message = "Expected subline separator"; 96 96 break; 97 97 }; 98 98
+17 -17
lib/skin_parser/skin_parser.c
··· 261 261 262 262 /* 263 263 * If conditional is set to true, then this will break upon encountering 264 - * SEPERATESYM. This should only be used when parsing a line inside a 264 + * SEPARATESYM. This should only be used when parsing a line inside a 265 265 * conditional, otherwise just use the wrapper function skin_parse_line() 266 266 */ 267 267 static struct skin_element* skin_parse_line_optional(const char** document, ··· 280 280 retval->type = LINE; 281 281 retval->line = skin_line; 282 282 if(*cursor != '\0' && *cursor != '\n' && *cursor != MULTILINESYM 283 - && !(conditional && (*cursor == ARGLISTSEPERATESYM 283 + && !(conditional && (*cursor == ARGLISTSEPARATESYM 284 284 || *cursor == ARGLISTCLOSESYM 285 - || *cursor == ENUMLISTSEPERATESYM 285 + || *cursor == ENUMLISTSEPARATESYM 286 286 || *cursor == ENUMLISTCLOSESYM))) 287 287 { 288 288 retval->children_count = 1; ··· 313 313 #endif 314 314 315 315 while(*cursor != '\n' && *cursor != '\0' && *cursor != MULTILINESYM 316 - && !((*cursor == ARGLISTSEPERATESYM 316 + && !((*cursor == ARGLISTSEPARATESYM 317 317 || *cursor == ARGLISTCLOSESYM 318 - || *cursor == ENUMLISTSEPERATESYM 318 + || *cursor == ENUMLISTSEPARATESYM 319 319 || *cursor == ENUMLISTCLOSESYM) 320 320 && conditional) 321 321 && !(check_viewport(cursor) && cursor != *document)) ··· 390 390 391 391 /* First we count the sublines */ 392 392 while(*cursor != '\0' && *cursor != '\n' 393 - && !((*cursor == ARGLISTSEPERATESYM 393 + && !((*cursor == ARGLISTSEPARATESYM 394 394 || *cursor == ARGLISTCLOSESYM 395 - || *cursor == ENUMLISTSEPERATESYM 395 + || *cursor == ENUMLISTSEPARATESYM 396 396 || *cursor == ENUMLISTCLOSESYM) 397 397 && conditional) 398 398 && !(check_viewport(cursor) && cursor != *document)) ··· 565 565 { 566 566 skip_arglist(&cursor); 567 567 } 568 - else if(*cursor == ARGLISTSEPERATESYM) 568 + else if(*cursor == ARGLISTSEPARATESYM) 569 569 { 570 570 num_args++; 571 571 cursor++; ··· 753 753 754 754 skip_whitespace(&cursor); 755 755 756 - if(*cursor != ARGLISTSEPERATESYM && i < num_args - 1) 756 + if(*cursor != ARGLISTSEPARATESYM && i < num_args - 1) 757 757 { 758 - skin_error(SEPERATOR_EXPECTED, cursor); 758 + skin_error(SEPARATOR_EXPECTED, cursor); 759 759 return 0; 760 760 } 761 761 else if(*cursor != ARGLISTCLOSESYM && i == num_args - 1) ··· 801 801 802 802 /* 803 803 * If the conditional flag is set true, then parsing text will stop at an 804 - * ARGLISTSEPERATESYM. Only set that flag when parsing within a conditional 804 + * ARGLISTSEPARATESYM. Only set that flag when parsing within a conditional 805 805 */ 806 806 static int skin_parse_text(struct skin_element* element, const char** document, 807 807 int conditional) ··· 814 814 /* First figure out how much text we're copying */ 815 815 while(*cursor != '\0' && *cursor != '\n' && *cursor != MULTILINESYM 816 816 && *cursor != COMMENTSYM 817 - && !((*cursor == ARGLISTSEPERATESYM 817 + && !((*cursor == ARGLISTSEPARATESYM 818 818 || *cursor == ARGLISTCLOSESYM 819 - || *cursor == ENUMLISTSEPERATESYM 819 + || *cursor == ENUMLISTSEPARATESYM 820 820 || *cursor == ENUMLISTCLOSESYM) 821 821 && conditional)) 822 822 { ··· 932 932 break; 933 933 cursor++; 934 934 } 935 - else if(*cursor == ENUMLISTSEPERATESYM) 935 + else if(*cursor == ENUMLISTSEPARATESYM) 936 936 { 937 937 children++; 938 938 cursor++; ··· 984 984 cursor = conditional_end; 985 985 #endif 986 986 987 - if(i < children - 1 && *cursor != ENUMLISTSEPERATESYM) 987 + if(i < children - 1 && *cursor != ENUMLISTSEPARATESYM) 988 988 { 989 - skin_error(SEPERATOR_EXPECTED, cursor); 989 + skin_error(SEPARATOR_EXPECTED, cursor); 990 990 return 0; 991 991 } 992 992 else if(i == children - 1 && *cursor != ENUMLISTCLOSESYM) ··· 1048 1048 1049 1049 /* Checking for sublines */ 1050 1050 while(*cursor != '\n' && *cursor != '\0' 1051 - && *cursor != ENUMLISTSEPERATESYM && *cursor != ARGLISTSEPERATESYM 1051 + && *cursor != ENUMLISTSEPARATESYM && *cursor != ARGLISTSEPARATESYM 1052 1052 && *cursor != ENUMLISTCLOSESYM && *cursor != ARGLISTCLOSESYM) 1053 1053 { 1054 1054 if(*cursor == MULTILINESYM)
+1 -1
lib/skin_parser/skin_parser.h
··· 58 58 INSUFFICIENT_ARGS, 59 59 INT_EXPECTED, 60 60 DECIMAL_EXPECTED, 61 - SEPERATOR_EXPECTED, 61 + SEPARATOR_EXPECTED, 62 62 CLOSE_EXPECTED, 63 63 MULTILINE_EXPECTED 64 64 };
+1 -1
lib/skin_parser/skin_scan.c
··· 101 101 char* buffer = NULL; 102 102 int i; 103 103 104 - while(*cursor != ARGLISTSEPERATESYM && *cursor != ARGLISTCLOSESYM && 104 + while(*cursor != ARGLISTSEPARATESYM && *cursor != ARGLISTCLOSESYM && 105 105 *cursor != '\0') 106 106 { 107 107 if(*cursor == COMMENTSYM)
+2 -2
lib/skin_parser/symbols.h
··· 36 36 #define MULTILINESYM ';' 37 37 #define ARGLISTOPENSYM '(' 38 38 #define ARGLISTCLOSESYM ')' 39 - #define ARGLISTSEPERATESYM ',' 40 - #define ENUMLISTSEPERATESYM '|' 39 + #define ARGLISTSEPARATESYM ',' 40 + #define ENUMLISTSEPARATESYM '|' 41 41 #define ENUMLISTOPENSYM '<' 42 42 #define ENUMLISTCLOSESYM '>' 43 43 #define DEFAULTSYM '-'