From: Orestis Floros <orestisf1993@gmail.com>
Date: Thu, 26 Apr 2018 20:58:42 +0000 (+0300)
Subject: Fix redundant return statements
X-Git-Tag: 4.16~88^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aca7790217f6bac58e4588a5b80fcd41de781c8e;p=i3%2Fi3

Fix redundant return statements

… at the end of a function with a void return type.

Found using clang-tidy's readability-redundant-control-flow.
---

diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index 7f9f2d64..f3c33034 100644
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -631,8 +631,6 @@ static void handle_button_press(xcb_button_press_event_t *event) {
         modifier = MOD_Mod1;
         handle_expose();
     }
-
-    return;
 }
 
 /*
diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 7bfeb12e..800c05d4 100644
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -2067,5 +2067,4 @@ void set_current_mode(struct mode *current) {
     I3STRING_FREE(binding.name);
     binding = *current;
     activated_mode = binding.name != NULL;
-    return;
 }
diff --git a/src/handlers.c b/src/handlers.c
index 15c05a8f..38c2caf1 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -184,8 +184,6 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) {
     focused_id = XCB_NONE;
     con_focus(con_descend_focused(con));
     tree_render();
-
-    return;
 }
 
 /*
@@ -249,8 +247,6 @@ static void handle_mapping_notify(xcb_mapping_notify_event_t *event) {
     ungrab_all_keys(conn);
     translate_keysyms();
     grab_all_keys(conn);
-
-    return;
 }
 
 /*
@@ -266,7 +262,6 @@ static void handle_map_request(xcb_map_request_event_t *event) {
     add_ignore_event(event->sequence, -1);
 
     manage_window(event->window, cookie, false);
-    return;
 }
 
 /*
@@ -474,8 +469,6 @@ static void handle_screen_change(xcb_generic_event_t *e) {
     scratchpad_fix_resolution();
 
     ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}");
-
-    return;
 }
 
 /*
@@ -659,7 +652,6 @@ static void handle_expose_event(xcb_expose_event_t *event) {
     draw_util_copy_surface(&(parent->frame_buffer), &(parent->frame),
                            0, 0, 0, 0, parent->rect.width, parent->rect.height);
     xcb_flush(conn);
-    return;
 }
 
 #define _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0
@@ -1243,7 +1235,6 @@ static void handle_focus_in(xcb_focus_in_event_t *event) {
     /* We update focused_id because we don’t need to set focus again */
     focused_id = event->event;
     tree_render();
-    return;
 }
 
 /*
diff --git a/src/manage.c b/src/manage.c
index 9dcc93f5..d591df15 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -664,5 +664,4 @@ geom_out:
     free(geom);
 out:
     free(attr);
-    return;
 }