diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-01 15:42:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-06 12:44:17 +1000 |
| commit | 9802cca816884e7f055f054ac1ba9194e0eba10b (patch) | |
| tree | 8a9bd17ce0f6e45b84f843888e1f2bce73311886 | |
| parent | 79ea9ef39971d008d199b18f34d1aef2bab6e33f (diff) | |
Remove atom field from InputInfoRec.
This field was only used in one location where we can use a local variable.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 5 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 6673b1e6f..bbaffd0b8 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -295,6 +295,7 @@ static DeviceIntPtr xf86ActivateDevice(InputInfoPtr pInfo) { DeviceIntPtr dev; + Atom atom; dev = AddInputDevice(serverClient, pInfo->device_control, TRUE); @@ -306,8 +307,8 @@ xf86ActivateDevice(InputInfoPtr pInfo) return NULL; } - pInfo->atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE); - AssignTypeAndName(dev, pInfo->atom, pInfo->name); + atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE); + AssignTypeAndName(dev, atom, pInfo->name); dev->public.devicePrivate = pInfo; pInfo->dev = dev; diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index edc447c25..9a3d2232d 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -122,7 +122,6 @@ typedef struct _InputInfoRec { int num_valuators); int fd; - Atom atom; DeviceIntPtr dev; pointer private; char * type_name; |