frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/touch: Initialize device name 

Without this change, the test will segfault when we switch to signal-
safe logging.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chase Douglas 2012-04-06 12:44:07 -07:00 committed by Peter Hutterer
parent 42ae2e8199
commit 12f9aaff38
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/touch.c
View File

@ -40,6 +40,7 @@ touch_grow_queue(void)
int i; int i;
memset(&dev, 0, sizeof(dev)); memset(&dev, 0, sizeof(dev));
dev.name = "test device";
dev.id = 2; dev.id = 2;
dev.valuator = &val; dev.valuator = &val;
val.numAxes = 5; val.numAxes = 5;
@ -94,6 +95,7 @@ touch_find_ddxid(void)
int i; int i;
memset(&dev, 0, sizeof(dev)); memset(&dev, 0, sizeof(dev));
dev.name = "test device";
dev.id = 2; dev.id = 2;
dev.valuator = &val; dev.valuator = &val;
val.numAxes = 5; val.numAxes = 5;
@ -162,6 +164,7 @@ touch_begin_ddxtouch(void)
int size = 5; int size = 5;
memset(&dev, 0, sizeof(dev)); memset(&dev, 0, sizeof(dev));
dev.name = "test device";
dev.id = 2; dev.id = 2;
dev.valuator = &val; dev.valuator = &val;
val.numAxes = 5; val.numAxes = 5;
@ -209,6 +212,7 @@ touch_begin_touch(void)
screenInfo.screens[0] = &screen; screenInfo.screens[0] = &screen;
memset(&dev, 0, sizeof(dev)); memset(&dev, 0, sizeof(dev));
dev.name = "test device";
dev.id = 2; dev.id = 2;
memset(&sprite, 0, sizeof(sprite)); memset(&sprite, 0, sizeof(sprite));
@ -247,6 +251,7 @@ touch_init(void)
screenInfo.screens[0] = &screen; screenInfo.screens[0] = &screen;
memset(&dev, 0, sizeof(dev)); memset(&dev, 0, sizeof(dev));
dev.name = "test device";
memset(&sprite, 0, sizeof(sprite)); memset(&sprite, 0, sizeof(sprite));
dev.spriteInfo = &sprite; dev.spriteInfo = &sprite;