From 7ca2da0f5d9e7708ec2774dc438cc94c7e1a5643 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 16 Jun 2017 15:03:09 -0400 Subject: [PATCH] evas: change _evas_pointer_data_add() to return created pointer data --- src/lib/evas/canvas/evas_main.c | 10 +++++----- src/lib/evas/include/evas_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 2d8f2e5..e7c3786 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1160,7 +1160,7 @@ _evas_pointer_data_by_device_get(Evas_Public_Data *edata, Efl_Input_Device *poin return NULL; } -Eina_Bool +Evas_Pointer_Data * _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer) { Evas_Pointer_Data *pdata; @@ -1168,13 +1168,13 @@ _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer) Eo *seat; seat = efl_input_device_seat_get(pointer); - EINA_SAFETY_ON_NULL_RETURN_VAL(seat, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL); EINA_INLIST_FOREACH(edata->seats, pseat) if (pseat->seat == seat) break; if (!pseat) { pseat = calloc(1, sizeof(Evas_Pointer_Seat)); - EINA_SAFETY_ON_NULL_RETURN_VAL(pseat, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(pseat, NULL); pseat->seat = seat; edata->seats = eina_inlist_append(edata->seats, EINA_INLIST_GET(pseat)); } @@ -1187,13 +1187,13 @@ _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer) free(pseat); } ERR("alloc fail"); - return EINA_FALSE; + return NULL; } pdata->pointer = pointer; pdata->seat = pseat; pseat->pointers = eina_inlist_append(pseat->pointers, EINA_INLIST_GET(pdata)); - return EINA_TRUE; + return pdata; } void diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index a755468..59f9f19 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -2071,7 +2071,7 @@ Eina_Bool _evas_image_proxy_source_clip_get(const Eo *eo_obj); void _evas_focus_dispatch_event(Evas_Object_Protected_Data *obj, Efl_Input_Device *seat, Eina_Bool in); Evas_Pointer_Data *_evas_pointer_data_by_device_get(Evas_Public_Data *edata, Efl_Input_Device *pointer); -Eina_Bool _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer); +Evas_Pointer_Data *_evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer); void _evas_pointer_data_remove(Evas_Public_Data *edata, Efl_Input_Device *pointer); Eina_List *_evas_pointer_list_in_rect_get(Evas_Public_Data *edata, Evas_Object *obj, -- 2.7.4