From 541dd6fda5ae93073a0b9c499f62af2cf46f3529 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 13 Sep 2009 12:24:14 +0000 Subject: Remove some trailing whitespaces in in the skin engine files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22694 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 114 ++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'apps/gui/skin_engine/skin_parser.c') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 5f5128533f..7d37e1972c 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -134,7 +134,7 @@ static int parse_dir_level(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data); static int parse_setting(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data); - + #ifdef HAVE_LCD_BITMAP static int parse_viewport_display(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data); @@ -170,7 +170,7 @@ static int fulline_tag_not_supported(const char *wps_bufptr, return skip_end_of_line(wps_bufptr); } #define parse_touchregion fulline_tag_not_supported -#endif +#endif #ifdef CONFIG_RTC #define WPS_RTC_REFRESH WPS_REFRESH_DYNAMIC #else @@ -287,7 +287,7 @@ static const struct wps_tag all_tags[] = { { WPS_TOKEN_REPEAT_MODE, "mm", WPS_REFRESH_DYNAMIC, NULL }, { WPS_TOKEN_PLAYBACK_STATUS, "mp", WPS_REFRESH_DYNAMIC, NULL }, - { WPS_TOKEN_BUTTON_VOLUME, "mv", WPS_REFRESH_DYNAMIC, + { WPS_TOKEN_BUTTON_VOLUME, "mv", WPS_REFRESH_DYNAMIC, parse_timeout }, #ifdef HAVE_LCD_BITMAP @@ -340,7 +340,7 @@ static const struct wps_tag all_tags[] = { { WPS_TOKEN_ALBUMART_DISPLAY, "C", WPS_REFRESH_STATIC, parse_albumart_display }, #endif - { WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC, + { WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC, parse_viewport_display }, { WPS_NO_TOKEN, "V", 0, parse_viewport }, @@ -350,16 +350,16 @@ static const struct wps_tag all_tags[] = { #endif { WPS_TOKEN_SETTING, "St", WPS_REFRESH_DYNAMIC, parse_setting }, - + { WPS_TOKEN_LASTTOUCH, "Tl", WPS_REFRESH_DYNAMIC, parse_timeout }, { WPS_NO_TOKEN, "T", 0, parse_touchregion }, - + { WPS_TOKEN_UNKNOWN, "", 0, NULL } /* the array MUST end with an empty string (first char is \0) */ }; -/* add a skin_token_list item to the list chain. ALWAYS appended because some of the +/* add a skin_token_list item to the list chain. ALWAYS appended because some of the * chains require the order to be kept. */ static void add_to_ll_chain(struct skin_token_list **list, struct skin_token_list *item) @@ -371,9 +371,9 @@ static void add_to_ll_chain(struct skin_token_list **list, struct skin_token_lis struct skin_token_list *t = *list; while (t->next) t = t->next; - t->next = item; + t->next = item; } -} +} /* create and init a new wpsll item. * passing NULL to token will alloc a new one. * You should only pass NULL for the token when the token type (table above) @@ -392,7 +392,7 @@ static struct skin_token_list *new_skin_token_list_item(struct wps_token *token, if (token_data) llitem->token->value.data = token_data; return llitem; -} +} /* Returns the number of chars that should be skipped to jump immediately after the first eol, i.e. to the start of the next line */ @@ -414,10 +414,10 @@ static bool skin_start_new_subline(struct skin_line *line, int curr_token) subline->first_token_idx = curr_token; subline->next = NULL; - + subline->line_type = 0; subline->time_mult = 0; - + line->curr_subline->last_token_idx = curr_token-1; line->curr_subline->next = subline; line->curr_subline = subline; @@ -430,19 +430,19 @@ static bool skin_start_new_line(struct skin_viewport *vp, int curr_token) struct skin_subline *subline = NULL; if (!line) return false; - - /* init the subline */ + + /* init the subline */ subline = &line->sublines; subline->first_token_idx = curr_token; - subline->next = NULL; + subline->next = NULL; subline->line_type = 0; subline->time_mult = 0; - + /* init the new line */ - line->curr_subline = &line->sublines; + line->curr_subline = &line->sublines; line->next = NULL; line->subline_expire_time = 0; - + /* connect to curr_line and vp pointers. * 1) close the previous lines subline * 2) connect to vp pointer @@ -567,9 +567,9 @@ static int parse_image_load(const char *wps_bufptr, const char *newline; int x,y; struct gui_img *img; - + /* format: %x|n|filename.bmp|x|y| - or %xl|n|filename.bmp|x|y| + or %xl|n|filename.bmp|x|y| or %xl|n|filename.bmp|x|y|num_subimages| */ @@ -653,14 +653,14 @@ static int parse_viewport(const char *wps_bufptr, (void)token; /* Kill warnings */ const char *ptr = wps_bufptr; - const int screen = + const int screen = #ifdef HAVE_REMOTE_LCD wps_data->remote_wps ? SCREEN_REMOTE : #endif SCREEN_MAIN; struct skin_viewport *skin_vp = skin_buffer_alloc(sizeof(struct skin_viewport)); - + /* check for the optional letter to signify its a hideable viewport */ /* %Vl|