xi2 leak--

SVN revision: 81724
This commit is contained in:
Carsten Haitzler 2012-12-27 05:26:14 +00:00
parent 2f1b5888b8
commit ebaf0ce575
1 changed files with 8 additions and 7 deletions

View File

@ -75,6 +75,7 @@ _ecore_x_input_touch_info_clear(void)
{ {
info = EINA_INLIST_CONTAINER_GET(l, Ecore_X_Touch_Device_Info); info = EINA_INLIST_CONTAINER_GET(l, Ecore_X_Touch_Device_Info);
l = eina_inlist_remove(l, l); l = eina_inlist_remove(l, l);
if (info->slot) free(info->slot);
free(info); free(info);
} }
@ -155,8 +156,8 @@ _ecore_x_input_touch_index_clear(int devid, int idx)
} }
} }
static Ecore_X_Touch_Device_Info* static Ecore_X_Touch_Device_Info *
_ecore_x_input_touch_info_get(XIDeviceInfo* dev) _ecore_x_input_touch_info_get(XIDeviceInfo *dev)
{ {
int k; int k;
int *slot = NULL; int *slot = NULL;
@ -168,11 +169,11 @@ _ecore_x_input_touch_info_get(XIDeviceInfo* dev)
for (k = 0; k < dev->num_classes; k++) for (k = 0; k < dev->num_classes; k++)
{ {
XIAnyClassInfo *class = dev->classes[k]; XIAnyClassInfo *clas = dev->classes[k];
if (class && (class->type == XITouchClass)) if (clas && (clas->type == XITouchClass))
{ {
t = (XITouchClassInfo*)class; t = (XITouchClassInfo *)clas;
break; break;
} }
} }
@ -182,7 +183,7 @@ _ecore_x_input_touch_info_get(XIDeviceInfo* dev)
info = calloc(1, sizeof(Ecore_X_Touch_Device_Info)); info = calloc(1, sizeof(Ecore_X_Touch_Device_Info));
if (!info) return NULL; if (!info) return NULL;
slot = (int*)malloc(sizeof(int)*(t->num_touches + 1)); slot = malloc(sizeof(int) * (t->num_touches + 1));
if (!slot) if (!slot)
{ {
free(info); free(info);
@ -193,7 +194,7 @@ _ecore_x_input_touch_info_get(XIDeviceInfo* dev)
info->max_touch = t->num_touches + 1; info->max_touch = t->num_touches + 1;
info->mode = t->mode; info->mode = t->mode;
info->name = dev->name; info->name = dev->name;
memset(slot, -1, sizeof(int)*info->max_touch); memset(slot, -1, sizeof(int) * info->max_touch);
info->slot = slot; info->slot = slot;
} }