diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-07-31 11:28:37 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-07-31 11:28:37 +0000 |
commit | c2529c341d4ecb8bea28f99f0f9e28e70c311487 (patch) | |
tree | edd2e78df0ccd1cd9a8027899309c66a5951cce2 /lib/skin_parser | |
parent | c9a3419b9e40d08cd93a536c1282348498a35b99 (diff) | |
download | rockbox-c2529c341d4ecb8bea28f99f0f9e28e70c311487.tar.gz rockbox-c2529c341d4ecb8bea28f99f0f9e28e70c311487.zip |
skinparser lib: some const correctness and marking of local vars as 'static'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27635 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'lib/skin_parser')
-rw-r--r-- | lib/skin_parser/skin_parser.c | 2 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.h | 2 | ||||
-rw-r--r-- | lib/skin_parser/tag_table.c | 10 | ||||
-rw-r--r-- | lib/skin_parser/tag_table.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c index 13c7b55e5e..7f648cf0ae 100644 --- a/lib/skin_parser/skin_parser.c +++ b/lib/skin_parser/skin_parser.c | |||
@@ -466,7 +466,7 @@ static int skin_parse_tag(struct skin_element* element, char** document) | |||
466 | 466 | ||
467 | char tag_name[3]; | 467 | char tag_name[3]; |
468 | char* tag_args; | 468 | char* tag_args; |
469 | struct tag_info *tag; | 469 | const struct tag_info *tag; |
470 | 470 | ||
471 | int num_args = 1; | 471 | int num_args = 1; |
472 | int i; | 472 | int i; |
diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h index 8514dfdd0e..6ccf31a0e5 100644 --- a/lib/skin_parser/skin_parser.h +++ b/lib/skin_parser/skin_parser.h | |||
@@ -101,7 +101,7 @@ struct skin_element | |||
101 | void* data; | 101 | void* data; |
102 | 102 | ||
103 | /* The tag or conditional name */ | 103 | /* The tag or conditional name */ |
104 | struct tag_info *tag; | 104 | const struct tag_info *tag; |
105 | 105 | ||
106 | /* Pointer to and size of an array of parameters */ | 106 | /* Pointer to and size of an array of parameters */ |
107 | int params_count; | 107 | int params_count; |
diff --git a/lib/skin_parser/tag_table.c b/lib/skin_parser/tag_table.c index a7e3378d24..26c049b3dd 100644 --- a/lib/skin_parser/tag_table.c +++ b/lib/skin_parser/tag_table.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <string.h> | 24 | #include <string.h> |
25 | #define BAR_PARAMS "*|iiiis" | 25 | #define BAR_PARAMS "*|iiiis" |
26 | /* The tag definition table */ | 26 | /* The tag definition table */ |
27 | struct tag_info legal_tags[] = | 27 | static const struct tag_info legal_tags[] = |
28 | { | 28 | { |
29 | { SKIN_TOKEN_ALIGN_CENTER, "ac", "", 0 }, | 29 | { SKIN_TOKEN_ALIGN_CENTER, "ac", "", 0 }, |
30 | { SKIN_TOKEN_ALIGN_LEFT, "al", "", 0 }, | 30 | { SKIN_TOKEN_ALIGN_LEFT, "al", "", 0 }, |
@@ -214,16 +214,16 @@ struct tag_info legal_tags[] = | |||
214 | }; | 214 | }; |
215 | 215 | ||
216 | /* A table of legal escapable characters */ | 216 | /* A table of legal escapable characters */ |
217 | char legal_escape_characters[] = "%(,);#<|>"; | 217 | static const char legal_escape_characters[] = "%(,);#<|>"; |
218 | 218 | ||
219 | /* | 219 | /* |
220 | * Just does a straight search through the tag table to find one by | 220 | * Just does a straight search through the tag table to find one by |
221 | * the given name | 221 | * the given name |
222 | */ | 222 | */ |
223 | struct tag_info* find_tag(char* name) | 223 | const struct tag_info* find_tag(const char* name) |
224 | { | 224 | { |
225 | 225 | ||
226 | struct tag_info* current = legal_tags; | 226 | const struct tag_info* current = legal_tags; |
227 | 227 | ||
228 | /* | 228 | /* |
229 | * Continue searching so long as we have a non-empty name string | 229 | * Continue searching so long as we have a non-empty name string |
@@ -244,7 +244,7 @@ struct tag_info* find_tag(char* name) | |||
244 | /* Searches through the legal escape characters string */ | 244 | /* Searches through the legal escape characters string */ |
245 | int find_escape_character(char lookup) | 245 | int find_escape_character(char lookup) |
246 | { | 246 | { |
247 | char* current = legal_escape_characters; | 247 | const char* current = legal_escape_characters; |
248 | while(*current != lookup && *current != '\0') | 248 | while(*current != lookup && *current != '\0') |
249 | current++; | 249 | current++; |
250 | 250 | ||
diff --git a/lib/skin_parser/tag_table.h b/lib/skin_parser/tag_table.h index dde1487d13..0266c2f6b5 100644 --- a/lib/skin_parser/tag_table.h +++ b/lib/skin_parser/tag_table.h | |||
@@ -303,7 +303,7 @@ struct tag_info | |||
303 | * Finds a tag by name and returns its parameter list, or an empty | 303 | * Finds a tag by name and returns its parameter list, or an empty |
304 | * string if the tag is not found in the table | 304 | * string if the tag is not found in the table |
305 | */ | 305 | */ |
306 | struct tag_info* find_tag(char* name); | 306 | const struct tag_info* find_tag(const char* name); |
307 | 307 | ||
308 | /* | 308 | /* |
309 | * Determines whether a character is legal to escape or not. If | 309 | * Determines whether a character is legal to escape or not. If |