[PATCH 7/7] Revert "xfree86/common: handle string constants in xf86Xinput configuration"

[Hans de Goede]

Hi,

On 01/30/2014 12:51 AM, Peter Hutterer wrote:
> This reverts commit 22592855e90d23013ba7f9e945d567725cb44bf3.
> 
> What warning was this supposed to fix?

Looks good:

Reviewed By: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans

> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  hw/xfree86/common/xf86Xinput.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
> index 3a01513..f6f2b90 100644
> --- a/hw/xfree86/common/xf86Xinput.c
> +++ b/hw/xfree86/common/xf86Xinput.c
> @@ -539,7 +539,7 @@ MatchAttrToken(const char *attr, struct xorg_list *patterns,
>       * match. Each list entry is a separate Match line of the same type.
>       */
>      xorg_list_for_each_entry(group, patterns, entry) {
> -        const char *const *cur;
> +        char *const *cur;
>          Bool match = FALSE;
>  
>          for (cur = group->values; *cur; cur++)
> @@ -598,7 +598,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
>       * See if any of the device's tags match any of the MatchTag tokens.
>       */
>      if (!xorg_list_is_empty(&iclass->match_tag)) {
> -        const char *const *tag;
> +        char *const *tag;
>          Bool match;
>  
>          if (!attrs->tags)
>