diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index f8c9b75a87..07f38bbee5 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -78,7 +78,7 @@ static int line_number; | |||
78 | /* the current viewport */ | 78 | /* the current viewport */ |
79 | static struct skin_viewport *curr_vp; | 79 | static struct skin_viewport *curr_vp; |
80 | /* the current line, linked to the above viewport */ | 80 | /* the current line, linked to the above viewport */ |
81 | static struct wps_line *curr_line; | 81 | static struct skin_line *curr_line; |
82 | 82 | ||
83 | #ifdef HAVE_LCD_BITMAP | 83 | #ifdef HAVE_LCD_BITMAP |
84 | 84 | ||
@@ -407,9 +407,9 @@ static int skip_end_of_line(const char *wps_bufptr) | |||
407 | } | 407 | } |
408 | 408 | ||
409 | /* Starts a new subline in the current line during parsing */ | 409 | /* Starts a new subline in the current line during parsing */ |
410 | static bool wps_start_new_subline(struct wps_line *line, int curr_token) | 410 | static bool skin_start_new_subline(struct skin_line *line, int curr_token) |
411 | { | 411 | { |
412 | struct wps_subline *subline = skin_buffer_alloc(sizeof(struct wps_subline)); | 412 | struct skin_subline *subline = skin_buffer_alloc(sizeof(struct skin_subline)); |
413 | if (!subline) | 413 | if (!subline) |
414 | return false; | 414 | return false; |
415 | 415 | ||
@@ -425,10 +425,10 @@ static bool wps_start_new_subline(struct wps_line *line, int curr_token) | |||
425 | return true; | 425 | return true; |
426 | } | 426 | } |
427 | 427 | ||
428 | static bool wps_start_new_line(struct skin_viewport *vp, int curr_token) | 428 | static bool skin_start_new_line(struct skin_viewport *vp, int curr_token) |
429 | { | 429 | { |
430 | struct wps_line *line = skin_buffer_alloc(sizeof(struct wps_line)); | 430 | struct skin_line *line = skin_buffer_alloc(sizeof(struct skin_line)); |
431 | struct wps_subline *subline = NULL; | 431 | struct skin_subline *subline = NULL; |
432 | if (!line) | 432 | if (!line) |
433 | return false; | 433 | return false; |
434 | 434 | ||
@@ -670,7 +670,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
670 | skin_vp->lines = NULL; | 670 | skin_vp->lines = NULL; |
671 | 671 | ||
672 | curr_line = NULL; | 672 | curr_line = NULL; |
673 | if (!wps_start_new_line(skin_vp, wps_data->num_tokens)) | 673 | if (!skin_start_new_line(skin_vp, wps_data->num_tokens)) |
674 | return WPS_ERROR_INVALID_PARAM; | 674 | return WPS_ERROR_INVALID_PARAM; |
675 | 675 | ||
676 | 676 | ||
@@ -873,7 +873,7 @@ static int parse_progressbar(const char *wps_bufptr, | |||
873 | /* we need to know what line number (viewport relative) this pb is, | 873 | /* we need to know what line number (viewport relative) this pb is, |
874 | * so count them... */ | 874 | * so count them... */ |
875 | int line_num = -1; | 875 | int line_num = -1; |
876 | struct wps_line *line = curr_vp->lines; | 876 | struct skin_line *line = curr_vp->lines; |
877 | while (line) | 877 | while (line) |
878 | { | 878 | { |
879 | line_num++; | 879 | line_num++; |
@@ -1386,7 +1386,7 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug) | |||
1386 | break; | 1386 | break; |
1387 | } | 1387 | } |
1388 | 1388 | ||
1389 | if (!wps_start_new_subline(curr_line, data->num_tokens)) | 1389 | if (!skin_start_new_subline(curr_line, data->num_tokens)) |
1390 | fail = PARSE_FAIL_LIMITS_EXCEEDED; | 1390 | fail = PARSE_FAIL_LIMITS_EXCEEDED; |
1391 | 1391 | ||
1392 | break; | 1392 | break; |
@@ -1472,7 +1472,7 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug) | |||
1472 | data->tokens[data->num_tokens].next = false; | 1472 | data->tokens[data->num_tokens].next = false; |
1473 | data->num_tokens++; | 1473 | data->num_tokens++; |
1474 | 1474 | ||
1475 | if (!wps_start_new_line(curr_vp, data->num_tokens)) | 1475 | if (!skin_start_new_line(curr_vp, data->num_tokens)) |
1476 | { | 1476 | { |
1477 | fail = PARSE_FAIL_LIMITS_EXCEEDED; | 1477 | fail = PARSE_FAIL_LIMITS_EXCEEDED; |
1478 | break; | 1478 | break; |
@@ -1706,7 +1706,7 @@ bool skin_data_load(struct wps_data *wps_data, | |||
1706 | curr_vp->lines = NULL; | 1706 | curr_vp->lines = NULL; |
1707 | 1707 | ||
1708 | curr_line = NULL; | 1708 | curr_line = NULL; |
1709 | if (!wps_start_new_line(curr_vp, 0)) | 1709 | if (!skin_start_new_line(curr_vp, 0)) |
1710 | return false; | 1710 | return false; |
1711 | 1711 | ||
1712 | switch (statusbar_position(display->screen_type)) | 1712 | switch (statusbar_position(display->screen_type)) |