Did you know the parser defines a global named 'val'? Gross.
Signed-off-by: Adam Jackson <[email protected]>
---
hw/xfree86/parser/scan.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 55a8442..f5f8f66 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -1135,30 +1135,30 @@ xf86addComment(char *cur, const char *add)
}
Bool
-xf86getBoolValue(Bool *val, const char *str)
+xf86getBoolValue(Bool *v, const char *str)
{
- if (!val || !str)
+ if (!v || !str)
return FALSE;
if (*str == '\0') {
- *val = TRUE;
+ *v = TRUE;
}
else {
if (xf86nameCompare(str, "1") == 0)
- *val = TRUE;
+ *v = TRUE;
else if (xf86nameCompare(str, "on") == 0)
- *val = TRUE;
+ *v = TRUE;
else if (xf86nameCompare(str, "true") == 0)
- *val = TRUE;
+ *v = TRUE;
else if (xf86nameCompare(str, "yes") == 0)
- *val = TRUE;
+ *v = TRUE;
else if (xf86nameCompare(str, "0") == 0)
- *val = FALSE;
+ *v = FALSE;
else if (xf86nameCompare(str, "off") == 0)
- *val = FALSE;
+ *v = FALSE;
else if (xf86nameCompare(str, "false") == 0)
- *val = FALSE;
+ *v = FALSE;
else if (xf86nameCompare(str, "no") == 0)
- *val = FALSE;
+ *v = FALSE;
else
return FALSE;
}
--
1.8.4.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
