[PATCH v2] parser: corrected xf86getBoolValue to use case insensitive compare

Dan Nicholson dbn.lists at gmail.com
Tue Feb 16 12:23:18 PST 2010


Keith, could you pick up this regression from my InputClass patches? I
thought it was in one of Peter's trees, but seems to have slipped
through the cracks.

--
Dan

On Wed, Feb 3, 2010 at 12:05 AM, Oliver McFadden
<oliver.mcfadden at nokia.com> wrote:
> commit c6e8637e29e0ca11dfb35c02da7ca6002ac8c597 introduced this
> regression; it can cause existing config files to be parsed incorrectly.
>
> Acked-by: Julien Cristau <jcristau at debian.org>
> Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
> Signed-off-by: Oliver McFadden <oliver.mcfadden at nokia.com>
> ---
>  hw/xfree86/parser/scan.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
> index b80fbfb..d25ada4 100644
> --- a/hw/xfree86/parser/scan.c
> +++ b/hw/xfree86/parser/scan.c
> @@ -1195,21 +1195,21 @@ xf86getBoolValue(Bool *val, const char *str)
>        if (*str == '\0') {
>                *val = TRUE;
>        } else {
> -               if (strcmp(str, "1") == 0)
> +               if (xf86nameCompare(str, "1") == 0)
>                        *val = TRUE;
> -               else if (strcmp(str, "on") == 0)
> +               else if (xf86nameCompare(str, "on") == 0)
>                        *val = TRUE;
> -               else if (strcmp(str, "true") == 0)
> +               else if (xf86nameCompare(str, "true") == 0)
>                        *val = TRUE;
> -               else if (strcmp(str, "yes") == 0)
> +               else if (xf86nameCompare(str, "yes") == 0)
>                        *val = TRUE;
> -               else if (strcmp(str, "0") == 0)
> +               else if (xf86nameCompare(str, "0") == 0)
>                        *val = FALSE;
> -               else if (strcmp(str, "off") == 0)
> +               else if (xf86nameCompare(str, "off") == 0)
>                        *val = FALSE;
> -               else if (strcmp(str, "false") == 0)
> +               else if (xf86nameCompare(str, "false") == 0)
>                        *val = FALSE;
> -               else if (strcmp(str, "no") == 0)
> +               else if (xf86nameCompare(str, "no") == 0)
>                        *val = FALSE;
>                else
>                        return FALSE;
> --
> 1.6.1
>
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel
>


More information about the xorg-devel mailing list