diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-01-30 09:01:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-02-04 11:27:48 +1000 |
| commit | 45f1d527f39a296104f2fa79a774446e7e1560e0 (patch) | |
| tree | f86738ab7cd125c21976368ebbf71340c8c0d5c8 /include/inputstr.h | |
| parent | 675f215af291135ee3ece5414e4a5a2e89bf4ed3 (diff) | |
input: un-constify dev->name
Fallout from fecc7eb1cf66db64728ee2d68cd9443df7e70879, and reverts most of the
rest of that patch.
The device name is allocated and may even change during PreInit. The const
warnings came from the test codes, the correct fix here is to fix the test
code.
touch.c: In function ‘touch_init’:
touch.c:254:14: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
dev.name = "test device";
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'include/inputstr.h')
| -rw-r--r-- | include/inputstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/inputstr.h b/include/inputstr.h index dfcf7c383..f6cfb049d 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -542,7 +542,7 @@ typedef struct _DeviceIntRec { GrabInfoRec deviceGrab; /* grab on the device */ int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */ Atom xinput_type; - const char *name; + char *name; int id; KeyClassPtr key; ValuatorClassPtr valuator; |