XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-04-07 08:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle driver removal cleanly, we now xfree everything we Xcalloc.

Browse Source 
NOTE: Someone needs to check for memory leaks, I'd be willing to bet
a fair bit that we've got tons in the mouse and xkb code, but.
This commit is contained in:
Zephaniah E. Hull
2007-04-24 07:34:25 -04:00
parent 246812bfbc
commit 1716ec88bb
1 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/evdev.c
View File

@@ -235,14 +235,6 @@ EvdevProc(DeviceIntPtr device, int what)
EvdevKeyOff (device);
}
#if 0
/*
* FIXME: Handle device removal properly.
*/
if (what == DEVICE_CLOSE)
evdevRemoveDevice(pEvdev);
#endif
device->public.on = FALSE;
break;
}
@@ -367,6 +359,72 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
return pInfo;
}
static void
EvdevUnInit (InputDriverRec *drv, InputInfoRec *pInfo, int flags)
{
evdevDevicePtr pEvdev = pInfo->private;
evdevStatePtr state = &pEvdev->state;
if (pEvdev->device) {
xfree (pEvdev->device);
pEvdev->device = NULL;
}
if (state->btn) {
xfree (state->btn);
state->btn = NULL;
}
if (state->abs) {
xfree (state->abs);
state->abs = NULL;
}
if (state->rel) {
xfree (state->rel);
state->rel = NULL;
}
if (state->axes) {
xfree (state->axes);
state->axes = NULL;
}
if (state->key) {
evdevKeyRec *key = state->key;
if (key->xkb_rules) {
xfree (key->xkb_rules);
key->xkb_rules = NULL;
}
if (key->xkb_model) {
xfree (key->xkb_model);
key->xkb_model = NULL;
}
if (key->xkb_layout) {
xfree (key->xkb_layout);
key->xkb_layout = NULL;
}
if (key->xkb_variant) {
xfree (key->xkb_variant);
key->xkb_variant = NULL;
}
if (key->xkb_options) {
xfree (key->xkb_options);
key->xkb_options = NULL;
}
xfree (state->key);
state->key = NULL;
}
xf86DeleteInput (pInfo, 0);
}
_X_EXPORT InputDriverRec EVDEV = {
@@ -374,7 +432,7 @@ _X_EXPORT InputDriverRec EVDEV = {
"evdev",
NULL,
EvdevPreInit,
NULL,
EvdevUnInit,
NULL,
0
};