summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-06-23 06:17:22 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-06-23 06:17:22 +0000
commit082f50b9478b4b6ca91b89b6649f93e272b614b9 (patch)
tree54b2af9f1deef79d49cebe31e4580c85bf9fb740
parent5a169bb71707dae31a886e1b932341b70eacf2df (diff)
downloadrockbox-082f50b9478b4b6ca91b89b6649f93e272b614b9.tar.gz
rockbox-082f50b9478b4b6ca91b89b6649f93e272b614b9.zip
fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17760 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/wps_parser.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index dc9abd98fb..c6b0d447e9 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -135,8 +135,6 @@ static int parse_viewport(const char *wps_bufptr,
135 struct wps_token *token, struct wps_data *wps_data); 135 struct wps_token *token, struct wps_data *wps_data);
136static int parse_leftmargin(const char *wps_bufptr, 136static int parse_leftmargin(const char *wps_bufptr,
137 struct wps_token *token, struct wps_data *wps_data); 137 struct wps_token *token, struct wps_data *wps_data);
138static int parse_image_special(const char *wps_bufptr,
139 struct wps_token *token, struct wps_data *wps_data);
140static int parse_statusbar_enable(const char *wps_bufptr, 138static int parse_statusbar_enable(const char *wps_bufptr,
141 struct wps_token *token, struct wps_data *wps_data); 139 struct wps_token *token, struct wps_data *wps_data);
142static int parse_statusbar_disable(const char *wps_bufptr, 140static int parse_statusbar_disable(const char *wps_bufptr,
@@ -146,6 +144,10 @@ static int parse_image_display(const char *wps_bufptr,
146static int parse_image_load(const char *wps_bufptr, 144static int parse_image_load(const char *wps_bufptr,
147 struct wps_token *token, struct wps_data *wps_data); 145 struct wps_token *token, struct wps_data *wps_data);
148#endif /*HAVE_LCD_BITMAP */ 146#endif /*HAVE_LCD_BITMAP */
147#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
148static int parse_image_special(const char *wps_bufptr,
149 struct wps_token *token, struct wps_data *wps_data);
150#endif
149#ifdef HAVE_ALBUMART 151#ifdef HAVE_ALBUMART
150static int parse_albumart_load(const char *wps_bufptr, 152static int parse_albumart_load(const char *wps_bufptr,
151 struct wps_token *token, struct wps_data *wps_data); 153 struct wps_token *token, struct wps_data *wps_data);
@@ -711,11 +713,13 @@ static int parse_viewport(const char *wps_bufptr,
711} 713}
712 714
713 715
716#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
714static int parse_image_special(const char *wps_bufptr, 717static int parse_image_special(const char *wps_bufptr,
715 struct wps_token *token, 718 struct wps_token *token,
716 struct wps_data *wps_data) 719 struct wps_data *wps_data)
717{ 720{
718 (void)wps_data; /* kill warning */ 721 (void)wps_data; /* kill warning */
722 (void)token;
719 const char *pos = NULL; 723 const char *pos = NULL;
720 const char *newline; 724 const char *newline;
721 725
@@ -735,6 +739,7 @@ static int parse_image_special(const char *wps_bufptr,
735 /* Skip the rest of the line */ 739 /* Skip the rest of the line */
736 return skip_end_of_line(wps_bufptr); 740 return skip_end_of_line(wps_bufptr);
737} 741}
742#endif
738 743
739#endif /* HAVE_LCD_BITMAP */ 744#endif /* HAVE_LCD_BITMAP */
740 745
@@ -804,7 +809,8 @@ static int parse_progressbar(const char *wps_bufptr,
804 PB_HEIGHT 809 PB_HEIGHT
805 }; 810 };
806 const char *filename; 811 const char *filename;
807 int x, y, height, width, set = 0; 812 int x, y, height, width;
813 uint32_t set = 0;
808 const char *ptr = wps_bufptr; 814 const char *ptr = wps_bufptr;
809 struct progressbar *pb; 815 struct progressbar *pb;
810 struct viewport *vp = &wps_data->viewports[wps_data->num_viewports].vp; 816 struct viewport *vp = &wps_data->viewports[wps_data->num_viewports].vp;