From ae49b387bfe78250808a98565f6a233f22045f12 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Sat, 7 Jun 2008 09:01:02 +0000
Subject: Accept FS#9075 and rename valid_vals to set_vals

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17698 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/wps_parser.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'apps/gui/wps_parser.c')

diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 859e5eebe2..53605e27cc 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -544,7 +544,7 @@ static int parse_viewport(const char *wps_bufptr,
     const char *ptr = wps_bufptr;
     struct viewport* vp;
     int depth;
-    int valid = 0;
+    uint32_t set = 0;
     enum {
         PL_X = 0,
         PL_Y,
@@ -590,7 +590,7 @@ static int parse_viewport(const char *wps_bufptr,
 #ifdef HAVE_LCD_COLOR
     if (depth == 16)
     {
-        if (!(ptr = parse_list("dddddcc", &valid, '|', ptr, &vp->x, &vp->y, &vp->width,
+        if (!(ptr = parse_list("dddddcc", &set, '|', ptr, &vp->x, &vp->y, &vp->width,
                     &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern)))
             return WPS_ERROR_INVALID_PARAM;
     }
@@ -601,7 +601,7 @@ static int parse_viewport(const char *wps_bufptr,
         /* Default to black on white */
         vp->fg_pattern = 0;
         vp->bg_pattern = 3;
-        if (!(ptr = parse_list("dddddgg", &valid, '|', ptr, &vp->x, &vp->y, &vp->width,
+        if (!(ptr = parse_list("dddddgg", &set, '|', ptr, &vp->x, &vp->y, &vp->width,
                     &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern)))
             return WPS_ERROR_INVALID_PARAM;
     }
@@ -610,7 +610,7 @@ static int parse_viewport(const char *wps_bufptr,
 #if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1)
     if (depth == 1)
     {
-        if (!(ptr = parse_list("ddddd", &valid, '|', ptr, &vp->x, &vp->y, 
+        if (!(ptr = parse_list("ddddd", &set, '|', ptr, &vp->x, &vp->y, 
                                     &vp->width, &vp->height, &vp->font)))
             return WPS_ERROR_INVALID_PARAM;
     }
@@ -622,17 +622,17 @@ static int parse_viewport(const char *wps_bufptr,
     if (*ptr != '|')
         return WPS_ERROR_INVALID_PARAM;
 
-    if ((valid&(1<<PL_X)) == 0 || (valid&(1<<PL_Y)) == 0)
+    if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y))
         return WPS_ERROR_INVALID_PARAM;
     
     /* fix defaults */
-    if ((valid&(1<<PL_WIDTH)) == 0)
+    if (!LIST_VALUE_PARSED(set, PL_WIDTH))
         vp->width = lcd_width - vp->x;
-    if ((valid&(1<<PL_HEIGHT)) == 0)
+    if (!LIST_VALUE_PARSED(set, PL_HEIGHT))
         vp->height = lcd_height - vp->y;
     
     /* Default to using the user font if the font was an invalid number */
-    if (((valid&(1<<PL_FONT)) == 0) ||
+    if (!LIST_VALUE_PARSED(set, PL_FONT) ||
          ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI)))
         vp->font = FONT_UI;
 
@@ -649,9 +649,9 @@ static int parse_viewport(const char *wps_bufptr,
 #ifdef HAVE_LCD_COLOR
     if (depth == 16)
     {
-        if ((valid&(1<<PL_FG)) == 0)
+        if (!LIST_VALUE_PARSED(set, PL_FG))
             vp->fg_pattern = global_settings.fg_color;
-        if ((valid&(1<<PL_BG)) == 0)
+        if (!LIST_VALUE_PARSED(set, PL_BG))
             vp->bg_pattern = global_settings.bg_color;
     }
 #endif
-- 
cgit v1.2.3