[PATCH v2 01/14] test/touch: Initialize device name
Peter Hutterer
peter.hutterer at who-t.net
Wed Apr 11 16:52:43 PDT 2012
On Mon, Apr 09, 2012 at 11:17:27AM -0700, Chase Douglas wrote:
> Without this change, the test will segfault when we switch to signal-
> safe logging.
>
> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Cheers,
Peter
> ---
> test/touch.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/test/touch.c b/test/touch.c
> index 2ec535b..df1db11 100644
> --- a/test/touch.c
> +++ b/test/touch.c
> @@ -40,6 +40,7 @@ touch_grow_queue(void)
> int i;
>
> memset(&dev, 0, sizeof(dev));
> + dev.name = "test device";
> dev.id = 2;
> dev.valuator = &val;
> val.numAxes = 5;
> @@ -94,6 +95,7 @@ touch_find_ddxid(void)
> int i;
>
> memset(&dev, 0, sizeof(dev));
> + dev.name = "test device";
> dev.id = 2;
> dev.valuator = &val;
> val.numAxes = 5;
> @@ -162,6 +164,7 @@ touch_begin_ddxtouch(void)
> int size = 5;
>
> memset(&dev, 0, sizeof(dev));
> + dev.name = "test device";
> dev.id = 2;
> dev.valuator = &val;
> val.numAxes = 5;
> @@ -209,6 +212,7 @@ touch_begin_touch(void)
> screenInfo.screens[0] = &screen;
>
> memset(&dev, 0, sizeof(dev));
> + dev.name = "test device";
> dev.id = 2;
>
> memset(&sprite, 0, sizeof(sprite));
> @@ -247,6 +251,7 @@ touch_init(void)
> screenInfo.screens[0] = &screen;
>
> memset(&dev, 0, sizeof(dev));
> + dev.name = "test device";
>
> memset(&sprite, 0, sizeof(sprite));
> dev.spriteInfo = &sprite;
> --
> 1.7.9.1
More information about the xorg-devel
mailing list