From: JengHyun Kang Date: Wed, 27 Sep 2017 12:39:35 +0000 (+0900) Subject: fix coverity issues X-Git-Tag: accepted/tizen/unified/20171102.061550~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1865b9b45942e870b2cbb9ae263f5355636b8293;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-gesture.git fix coverity issues - use E_GESTURE_ enum insteads of TIZEN_GESTURE - remove not necessary condition Change-Id: I25c613f472f58b743b50ef3ce67271f7b3589652 --- diff --git a/src/e_mod_gesture_events.c b/src/e_mod_gesture_events.c index ba460e8..81c6dd9 100644 --- a/src/e_mod_gesture_events.c +++ b/src/e_mod_gesture_events.c @@ -64,7 +64,7 @@ _e_gesture_event_queue(int type, void *event) error: if (e_info->event) E_FREE(e_info->event); - if (e_info) E_FREE(e_info); + E_FREE(e_info); } static void @@ -323,13 +323,13 @@ _e_gesture_send_edge_swipe(int fingers, int x, int y, int edge) goto finish; } - if (edge == TIZEN_GESTURE_EDGE_TOP || - edge == TIZEN_GESTURE_EDGE_BOTTOM) + if (edge == E_GESTURE_EDGE_TOP || + edge == E_GESTURE_EDGE_BOTTOM) { bp = x; } - else if (edge == TIZEN_GESTURE_EDGE_RIGHT || - edge == TIZEN_GESTURE_EDGE_LEFT) + else if (edge == E_GESTURE_EDGE_RIGHT || + edge == E_GESTURE_EDGE_LEFT) { bp = y; } @@ -352,7 +352,7 @@ _e_gesture_send_edge_swipe(int fingers, int x, int y, int edge) ecore_event_add(E_EVENT_GESTURE_EDGE_SWIPE, ev_swipe, NULL, NULL); } else - tizen_gesture_send_edge_swipe(edata->res, TIZEN_GESTURE_MODE_DONE, fingers, x, y, edge); + tizen_gesture_send_edge_swipe(edata->res, E_GESTURE_MODE_DONE, fingers, x, y, edge); break; } } @@ -386,9 +386,9 @@ _e_gesture_event_edge_check(E_Gesture_Event_Edge_Finger *fingers, int type, unsi if (type == E_GESTURE_TYPE_EDGE_SWIPE) { if ((conf->edge_swipe.default_enable_back) && - (edge == TIZEN_GESTURE_EDGE_TOP || + (edge == E_GESTURE_EDGE_TOP || ((edge_swipes->combined_keycode == conf->edge_swipe.compose_key) && - (edge_swipes->base.edge == TIZEN_GESTURE_EDGE_LEFT)))) + (edge_swipes->base.edge == E_GESTURE_EDGE_LEFT)))) { return EINA_TRUE; } @@ -399,8 +399,8 @@ _e_gesture_event_edge_check(E_Gesture_Event_Edge_Finger *fingers, int type, unsi EINA_LIST_FOREACH(fingers->edge[edge], l, edata) { - if (edge == TIZEN_GESTURE_EDGE_TOP || - edge == TIZEN_GESTURE_EDGE_BOTTOM) + if (edge == E_GESTURE_EDGE_TOP || + edge == E_GESTURE_EDGE_BOTTOM) { if ((coords.x >= edata->sp) && (coords.x <= edata->ep)) @@ -408,8 +408,8 @@ _e_gesture_event_edge_check(E_Gesture_Event_Edge_Finger *fingers, int type, unsi return EINA_TRUE; } } - else if ((edge == TIZEN_GESTURE_EDGE_LEFT) || - (edge == TIZEN_GESTURE_EDGE_RIGHT)) + else if ((edge == E_GESTURE_EDGE_LEFT) || + (edge == E_GESTURE_EDGE_RIGHT)) { if (coords.y >= edata->sp && coords.y <= edata->ep) @@ -616,7 +616,7 @@ _e_gesture_edge_drag_cancel(void) if (gesture->gesture_events.recognized_gesture & E_GESTURE_TYPE_EDGE_DRAG) { _e_gesture_util_center_axis_get(edge_drags->idx, ¤t_point.x, ¤t_point.y); - _e_gesture_send_edge_drag(edge_drags->idx, current_point.x, current_point.y, edge_drags->base.edge, TIZEN_GESTURE_MODE_END); + _e_gesture_send_edge_drag(edge_drags->idx, current_point.x, current_point.y, edge_drags->base.edge, E_GESTURE_MODE_END); } if (edge_drags->start_timer) @@ -660,13 +660,13 @@ _e_gesture_send_edge_drag(int fingers, int x, int y, int edge, int mode) ecore_event_add(ECORE_EVENT_MOUSE_BUTTON_CANCEL, ev_cancel, NULL, NULL); } - if (edge == TIZEN_GESTURE_EDGE_TOP || - edge == TIZEN_GESTURE_EDGE_BOTTOM) + if (edge == E_GESTURE_EDGE_TOP || + edge == E_GESTURE_EDGE_BOTTOM) { bp = edge_drags->start_point.x; } - else if (edge == TIZEN_GESTURE_EDGE_RIGHT || - edge == TIZEN_GESTURE_EDGE_LEFT) + else if (edge == E_GESTURE_EDGE_RIGHT || + edge == E_GESTURE_EDGE_LEFT) { bp = edge_drags->start_point.y; } @@ -723,7 +723,7 @@ _e_gesture_timer_edge_drag_start(void *data) edge_drags->start_point.x = edge_drags->center_point.x = start_point.x; edge_drags->start_point.y = edge_drags->center_point.y = start_point.y; edge_drags->idx = idx; - _e_gesture_send_edge_drag(edge_drags->idx, edge_drags->center_point.x, edge_drags->center_point.y, edge_drags->base.edge, TIZEN_GESTURE_MODE_BEGIN); + _e_gesture_send_edge_drag(edge_drags->idx, edge_drags->center_point.x, edge_drags->center_point.y, edge_drags->base.edge, E_GESTURE_MODE_BEGIN); } ecore_timer_del(edge_drags->start_timer); @@ -819,7 +819,7 @@ _e_gesture_process_edge_drag_move(Ecore_Event_Mouse_Move *ev) _e_gesture_send_edge_drag(edge_drags->idx, edge_drags->center_point.x, edge_drags->center_point.y, - edge_drags->base.edge, TIZEN_GESTURE_MODE_UPDATE); + edge_drags->base.edge, E_GESTURE_MODE_UPDATE); } static void @@ -840,7 +840,7 @@ _e_gesture_pan_send(int mode, int fingers, int cx, int cy, struct wl_resource *r Ecore_Event_Mouse_Button *ev_cancel; E_Event_Gesture_Pan *ev_pan; - if (mode == TIZEN_GESTURE_MODE_BEGIN) + if (mode == E_GESTURE_MODE_BEGIN) { ev_cancel = E_NEW(Ecore_Event_Mouse_Button, 1); EINA_SAFETY_ON_NULL_RETURN(ev_cancel); @@ -885,7 +885,7 @@ _e_gesture_pan_cancel(void) } if (pans->state == E_GESTURE_PANPINCH_STATE_MOVING) - _e_gesture_pan_send(TIZEN_GESTURE_MODE_END, pans->num_pan_fingers, 0, 0, + _e_gesture_pan_send(E_GESTURE_MODE_END, pans->num_pan_fingers, 0, 0, pans->fingers[pans->num_pan_fingers].res, pans->fingers[pans->num_pan_fingers].client); @@ -966,12 +966,12 @@ _e_gesture_process_pan_move(Ecore_Event_Mouse_Move *ev) switch (pans->state) { case E_GESTURE_PANPINCH_STATE_START: - mode = TIZEN_GESTURE_MODE_BEGIN; + mode = E_GESTURE_MODE_BEGIN; pans->state = E_GESTURE_PANPINCH_STATE_MOVING; pans->num_pan_fingers = idx; break; case E_GESTURE_PANPINCH_STATE_MOVING: - mode = TIZEN_GESTURE_MODE_UPDATE; + mode = E_GESTURE_MODE_UPDATE; break; default: return; @@ -982,8 +982,8 @@ _e_gesture_process_pan_move(Ecore_Event_Mouse_Move *ev) _e_gesture_pan_send(mode, idx, cur_point.x, cur_point.y, pans->fingers[idx].res, pans->fingers[idx].client); - if (mode == TIZEN_GESTURE_MODE_BEGIN) - mode = TIZEN_GESTURE_MODE_UPDATE; + if (mode == E_GESTURE_MODE_BEGIN) + mode = E_GESTURE_MODE_UPDATE; } } @@ -1002,7 +1002,7 @@ _e_gesture_pinch_send(int mode, int fingers, double distance, double angle, int Ecore_Event_Mouse_Button *ev_cancel; E_Event_Gesture_Pinch *ev_pinch; - if (mode == TIZEN_GESTURE_MODE_BEGIN) + if (mode == E_GESTURE_MODE_BEGIN) { ev_cancel = E_NEW(Ecore_Event_Mouse_Button, 1); EINA_SAFETY_ON_NULL_RETURN(ev_cancel); @@ -1049,7 +1049,7 @@ _e_gesture_pinch_cancel(void) } if (pinchs->state == E_GESTURE_PANPINCH_STATE_MOVING) - _e_gesture_pinch_send(TIZEN_GESTURE_MODE_END, pinchs->num_pinch_fingers, 0.0, 0.0, 0, 0, + _e_gesture_pinch_send(E_GESTURE_MODE_END, pinchs->num_pinch_fingers, 0.0, 0.0, 0, 0, pinchs->fingers[pinchs->num_pinch_fingers].res, pinchs->fingers[pinchs->num_pinch_fingers].client); @@ -1122,12 +1122,12 @@ _e_gesture_process_pinch_move(Ecore_Event_Mouse_Move *ev) switch (pinch->state) { case E_GESTURE_PANPINCH_STATE_START: - mode = TIZEN_GESTURE_MODE_BEGIN; + mode = E_GESTURE_MODE_BEGIN; pinch->state = E_GESTURE_PANPINCH_STATE_MOVING; pinch->num_pinch_fingers = idx; break; case E_GESTURE_PANPINCH_STATE_MOVING: - mode = TIZEN_GESTURE_MODE_UPDATE; + mode = E_GESTURE_MODE_UPDATE; break; default: return; @@ -1238,7 +1238,7 @@ _e_gesture_send_tap(int fingers, int repeats, struct wl_client *client, struct w ecore_event_add(E_EVENT_GESTURE_TAP, ev_tap, NULL, NULL); } else - tizen_gesture_send_tap(res, TIZEN_GESTURE_MODE_DONE, fingers, repeats); + tizen_gesture_send_tap(res, E_GESTURE_MODE_DONE, fingers, repeats); _e_gesture_event_drop(); gesture->gesture_events.recognized_gesture |= E_GESTURE_TYPE_TAP; @@ -1780,8 +1780,8 @@ _e_gesture_send_palm_cover(void) surface = NULL; } - tizen_gesture_send_palm_cover(palm_covers->client_info.res, surface, TIZEN_GESTURE_MODE_BEGIN, duration, size, pressure, cx, cy); - tizen_gesture_send_palm_cover(palm_covers->client_info.res, surface, TIZEN_GESTURE_MODE_END, duration, size, pressure, cx, cy); + tizen_gesture_send_palm_cover(palm_covers->client_info.res, surface, E_GESTURE_MODE_BEGIN, duration, size, pressure, cx, cy); + tizen_gesture_send_palm_cover(palm_covers->client_info.res, surface, E_GESTURE_MODE_END, duration, size, pressure, cx, cy); } gesture->event_state = E_GESTURE_EVENT_STATE_IGNORE; diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 9233cd1..096fb04 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -124,6 +124,7 @@ e_gesture_add_client_destroy_listener(struct wl_client *client, int mode, int fi if (!grabbed_client) { GTERR("Failed to allocate memory to save client information !\n"); + E_FREE(destroy_listener); return TIZEN_GESTURE_ERROR_NO_SYSTEM_RESOURCES; } @@ -450,30 +451,30 @@ _e_gesture_grab_edge_swipe(struct wl_client *client, gev = &gesture->gesture_events; - if (edge < TIZEN_GESTURE_EDGE_TOP || edge > TIZEN_GESTURE_EDGE_LEFT) + if (edge < E_GESTURE_EDGE_TOP || edge > E_GESTURE_EDGE_LEFT) { GTWRN("Invalid edge(%d)\n", edge); ret = TIZEN_GESTURE_ERROR_INVALID_DATA; return ret; } - if (edge_size == TIZEN_GESTURE_EDGE_SIZE_PARTIAL) + if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL) { sp = start_point; ep = end_point; - if (((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) && + if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) && (ep > e_comp->w)) ep = e_comp->w; - else if (((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) && + else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) && (ep > e_comp->h)) ep = e_comp->h; } - else if (edge_size == TIZEN_GESTURE_EDGE_SIZE_FULL) + else if (edge_size == E_GESTURE_EDGE_SIZE_FULL) { sp = 0; - if ((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) + if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) ep = e_comp->w; - else if ((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) + else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) ep = e_comp->h; } else @@ -534,23 +535,23 @@ _e_gesture_ungrab_edge_swipe(struct wl_client *client, gev = &gesture->gesture_events; - if (edge_size == TIZEN_GESTURE_EDGE_SIZE_PARTIAL) + if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL) { sp = start_point; ep = end_point; - if (((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) && + if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) && (ep > e_comp->w)) ep = e_comp->w; - else if (((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) && + else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) && (ep > e_comp->h)) ep = e_comp->h; } - else if (edge_size == TIZEN_GESTURE_EDGE_SIZE_FULL) + else if (edge_size == E_GESTURE_EDGE_SIZE_FULL) { sp = 0; - if ((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) + if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) ep = e_comp->w; - else if ((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) + else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) ep = e_comp->h; } else @@ -611,30 +612,30 @@ _e_gesture_grab_edge_drag(struct wl_client *client, goto out; } - if (edge < TIZEN_GESTURE_EDGE_TOP || edge > TIZEN_GESTURE_EDGE_LEFT) + if (edge < E_GESTURE_EDGE_TOP || edge > E_GESTURE_EDGE_LEFT) { GTWRN("Invalid edge(%d)\n", edge); ret = TIZEN_GESTURE_ERROR_INVALID_DATA; goto out; } - if (edge_size == TIZEN_GESTURE_EDGE_SIZE_PARTIAL) + if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL) { sp = start_point; ep = end_point; - if (((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) && + if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) && (ep > e_comp->w)) ep = e_comp->w; - else if (((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) && + else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) && (ep > e_comp->h)) ep = e_comp->h; } - else if (edge_size == TIZEN_GESTURE_EDGE_SIZE_FULL) + else if (edge_size == E_GESTURE_EDGE_SIZE_FULL) { sp = 0; - if ((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) + if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) ep = e_comp->w; - else if ((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) + else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) ep = e_comp->h; } else @@ -691,23 +692,23 @@ _e_gesture_ungrab_edge_drag(struct wl_client *client, goto out; } - if (edge_size == TIZEN_GESTURE_EDGE_SIZE_PARTIAL) + if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL) { sp = start_point; ep = end_point; - if (((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) && + if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) && (ep > e_comp->w)) ep = e_comp->w; - else if (((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) && + else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) && (ep > e_comp->h)) ep = e_comp->h; } - else if (edge_size == TIZEN_GESTURE_EDGE_SIZE_FULL) + else if (edge_size == E_GESTURE_EDGE_SIZE_FULL) { sp = 0; - if ((edge == TIZEN_GESTURE_EDGE_TOP) || (edge == TIZEN_GESTURE_EDGE_BOTTOM)) + if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) ep = e_comp->w; - else if ((edge == TIZEN_GESTURE_EDGE_RIGHT) || (edge == TIZEN_GESTURE_EDGE_LEFT)) + else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) ep = e_comp->h; } else @@ -1857,7 +1858,7 @@ _e_gesture_init(E_Module *m) gesture->grabbed_gesture |= E_GESTURE_TYPE_EDGE_SWIPE; gesture->gesture_events.edge_swipes.base.fingers[1].enabled = EINA_TRUE; _e_gesture_edge_grab_add(&gesture->gesture_events.edge_swipes.base.fingers[1], (void *)0x1, (void *)0x1, E_GESTURE_EDGE_TOP, 0, 0); - gesture->gesture_events.edge_swipes.base.enabled_edge |= (1 << TIZEN_GESTURE_EDGE_TOP); + gesture->gesture_events.edge_swipes.base.enabled_edge |= (1 << E_GESTURE_EDGE_TOP); if (gesture->gesture_events.event_keep) { gesture->event_state = E_GESTURE_EVENT_STATE_KEEP;