[clang-tidy] do not use else after return

Found with readability-else-after-return

Signed-off-by: Rosen Penev <rosenp@gmail.com>

3 files changed, 31 insertions, 25 deletions

diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c
index a803e7b7..a0e5d334 100644
--- a/tools/libinput-list-devices.c
+++ b/tools/libinput-list-devices.c
@@ -44,8 +44,8 @@ tap_default(struct libinput_device *device)
 
 	if (libinput_device_config_tap_get_default_enabled(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static const char *
@@ -56,8 +56,8 @@ drag_default(struct libinput_device *device)
 
 	if (libinput_device_config_tap_get_default_drag_enabled(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static const char *
@@ -68,8 +68,8 @@ draglock_default(struct libinput_device *device)
 
 	if (libinput_device_config_tap_get_default_drag_lock_enabled(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static const char*
@@ -80,8 +80,8 @@ left_handed_default(struct libinput_device *device)
 
 	if (libinput_device_config_left_handed_get_default(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static const char *
@@ -92,8 +92,8 @@ nat_scroll_default(struct libinput_device *device)
 
 	if (libinput_device_config_scroll_get_default_natural_scroll_enabled(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static const char *
@@ -104,8 +104,8 @@ middle_emulation_default(struct libinput_device *device)
 
 	if (libinput_device_config_middle_emulation_get_default_enabled(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static char *
@@ -222,8 +222,8 @@ dwt_default(struct libinput_device *device)
 
 	if (libinput_device_config_dwt_get_default_enabled(device))
 		return "enabled";
-	else
-		return "disabled";
+
+	return "disabled";
 }
 
 static char *
@@ -384,13 +384,15 @@ main(int argc, char **argv)
 		if (streq(argv[1], "--help")) {
 			usage();
 			return 0;
-		} else if (streq(argv[1], "--version")) {
+		}
+
+		if (streq(argv[1], "--version")) {
 			printf("%s\n", LIBINPUT_VERSION);
 			return 0;
-		} else {
-			usage();
-			return EXIT_INVALID_USAGE;
 		}
+
+		usage();
+		return EXIT_INVALID_USAGE;
 	}
 
 	li = tools_open_backend(BACKEND_UDEV, seat, false, &grab);
diff --git a/tools/libinput-record.c b/tools/libinput-record.c
index 79715a91..6572858c 100644
--- a/tools/libinput-record.c
+++ b/tools/libinput-record.c
@@ -2200,12 +2200,17 @@ mainloop(struct record_context *ctx)
 				fprintf(stderr, "Error: %m\n");
 				autorestart = false;
 				break;
-			} else if (rc == 0) {
+			}
+
+			if (rc == 0) {
 				fprintf(stderr,
 					" ... timeout%s\n",
 					had_events ? "" : " (file is empty)");
 				break;
-			} else if (fds[0].revents != 0) { /* signal */
+
+			}
+
+			if (fds[0].revents != 0) { /* signal */
 				autorestart = false;
 				break;
 			}
diff --git a/tools/shared.c b/tools/shared.c
index af791274..0e99c358 100644
--- a/tools/shared.c
+++ b/tools/shared.c
@@ -564,12 +564,11 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv)
 				"libinput: %s is not installed\n",
 				command);
 			return EXIT_INVALID_USAGE;
-		} else {
-			fprintf(stderr,
-				"Failed to execute '%s' (%s)\n",
-				command,
-				strerror(errno));
 		}
+		fprintf(stderr,
+			"Failed to execute '%s' (%s)\n",
+			command,
+			strerror(errno));
 	}
 
 	return EXIT_FAILURE;