From f46a40a471d38dd7c81a7420048d7885f42a97ef Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 8 Oct 2021 08:35:04 -0400 Subject: [PATCH] Utilities: Fix -Wunreachable-code warnings from clang --- Userland/Utilities/fgrep.cpp | 1 - Userland/Utilities/ping.cpp | 2 -- Userland/Utilities/strace.cpp | 2 -- Userland/Utilities/top.cpp | 1 - Userland/Utilities/tt.cpp | 10 ---------- Userland/Utilities/yes.cpp | 1 - 6 files changed, 17 deletions(-) diff --git a/Userland/Utilities/fgrep.cpp b/Userland/Utilities/fgrep.cpp index 639533ac8ba..cdbbd7bbd95 100644 --- a/Userland/Utilities/fgrep.cpp +++ b/Userland/Utilities/fgrep.cpp @@ -25,5 +25,4 @@ int main(int argc, char** argv) return 0; VERIFY(str); } - return 0; } diff --git a/Userland/Utilities/ping.cpp b/Userland/Utilities/ping.cpp index 1ff60807952..43848be6dea 100644 --- a/Userland/Utilities/ping.cpp +++ b/Userland/Utilities/ping.cpp @@ -225,6 +225,4 @@ int main(int argc, char** argv) sleep(1); } - - return 0; } diff --git a/Userland/Utilities/strace.cpp b/Userland/Utilities/strace.cpp index c605547a5d3..a57d6cdfd06 100644 --- a/Userland/Utilities/strace.cpp +++ b/Userland/Utilities/strace.cpp @@ -790,6 +790,4 @@ int main(int argc, char** argv) return 1; } } - - return 0; } diff --git a/Userland/Utilities/top.cpp b/Userland/Utilities/top.cpp index 7e333eefafd..8630deed198 100644 --- a/Userland/Utilities/top.cpp +++ b/Userland/Utilities/top.cpp @@ -297,5 +297,4 @@ int main(int argc, char** argv) prev = move(current); sleep(top_option.delay_time); } - return 0; } diff --git a/Userland/Utilities/tt.cpp b/Userland/Utilities/tt.cpp index 49bbc66323a..574bd140e9a 100644 --- a/Userland/Utilities/tt.cpp +++ b/Userland/Utilities/tt.cpp @@ -58,7 +58,6 @@ int main(int argc, char** argv) &thread_id, nullptr, [](void*) -> void* { outln("Hi there, from the second thread!"); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { @@ -96,8 +95,6 @@ int mutex_test() pthread_mutex_unlock(&mutex); sleep(1); } - pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { @@ -110,7 +107,6 @@ int mutex_test() pthread_mutex_unlock(&mutex); usleep(10000); } - return 0; } int detached_test() @@ -144,7 +140,6 @@ int detached_test() outln("I'm the secondary thread :^)"); sleep(1); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc != 0) { @@ -206,7 +201,6 @@ int priority_test() outln("I'm the secondary thread :^)"); sleep(1); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { @@ -260,7 +254,6 @@ int stack_size_test() outln("I'm the secondary thread :^)"); sleep(1); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { @@ -294,7 +287,6 @@ int staying_alive_test() sleep(3520); outln("Secondary thread exiting"); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { @@ -354,7 +346,6 @@ int set_stack_test() outln("I'm the secondary thread :^)"); sleep(1); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { @@ -386,7 +377,6 @@ int kill_test() sleep(100); outln("Secondary thread is still alive :^("); pthread_exit((void*)0xDEADBEEF); - return nullptr; }, nullptr); if (rc < 0) { diff --git a/Userland/Utilities/yes.cpp b/Userland/Utilities/yes.cpp index 7f5d2f6e488..fab0428428f 100644 --- a/Userland/Utilities/yes.cpp +++ b/Userland/Utilities/yes.cpp @@ -23,5 +23,4 @@ int main(int argc, char** argv) for (;;) puts(string); - return 0; }