fix cppcheck issues (src/screen_reader_gestures.c) 46/106146/1
authorRadoslaw Cybulski <r.cybulski@partner.samsung.com>
Tue, 20 Dec 2016 12:29:21 +0000 (13:29 +0100)
committerRadoslaw Cybulski <r.cybulski@partner.samsung.com>
Tue, 20 Dec 2016 12:29:21 +0000 (13:29 +0100)
Change-Id: I13174b40d596d826789a7db2532958379079eceb

src/screen_reader_gestures.c

index e06578dc49e98803592f2ba0c5d083ea78057448..fc1e0e4722c34bb46e2a34de4d80af0cda52191d 100644 (file)
@@ -658,12 +658,13 @@ abort:
 
 static void _hover_gesture_mouse_up(Ecore_Event_Mouse_Button * ev, Screen_Reader_Gestures_Data *gestures_ctx)
 {
-       if (gestures_ctx == NULL)
+       if (gestures_ctx == NULL) {
                ERROR("NULL context parameter");
+               return;
+       }
 
-       int i;
        if (gestures_ctx->cov->hover_gesture.state == GESTURE_ONGOING) {
-
+               int i;
                for (i = 0; i < gestures_ctx->cov->hover_gesture.n_fingers; i++) {
                        if (gestures_ctx->cov->hover_gesture.finger[i] == ev->multi.device)
                                break;
@@ -671,7 +672,8 @@ static void _hover_gesture_mouse_up(Ecore_Event_Mouse_Button * ev, Screen_Reader
                if (i == gestures_ctx->cov->hover_gesture.n_fingers) {
                        DEBUG("Invalid finger id: %d", ev->multi.device);
                        return;
-               } else {
+               }
+               else {
                        gestures_ctx->cov->hover_gesture.state = GESTURE_ABORTED;
                        if (gestures_ctx->cov->hover_gesture.timer)
                                ecore_timer_del(gestures_ctx->cov->hover_gesture.timer);
@@ -685,6 +687,7 @@ static void _hover_gesture_mouse_up(Ecore_Event_Mouse_Button * ev, Screen_Reader
        if (gestures_ctx->cov->n_taps == 0)
                gestures_ctx->cov->hover_gesture.state = GESTURE_NOT_STARTED;
 }
+
 #ifdef X11_ENABLED
 static void _get_root_coords(Ecore_X_Window win, int *x, int *y)
 {