aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeija <doremylover123@gmail.com>2022-12-02 17:02:58 +0000
committerJunio C Hamano <gitster@pobox.com>2022-12-05 10:15:54 +0900
commit786e67611d46cd761e1aaa73f85b62f3dda1960a (patch)
treefccb324ff39356045f3031ef4c6b005794a0d96b
parentDownmerge a bit more for 2.38.2 (diff)
downloadgit-786e67611d46cd761e1aaa73f85b62f3dda1960a.tar.gz
git-786e67611d46cd761e1aaa73f85b62f3dda1960a.zip
maintenance: compare output of pthread functions for inequality with 0
The documentation for pthread_create and pthread_sigmask state that: "On success, pthread_create() returns 0; on error, it returns an error number" As such, we ought to check for an error by seeing if the output is not 0. Checking for "less than" is a mistake as the error code numbers can be greater than 0. Signed-off-by: Seija <doremylover123@gmail.com> Acked-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/fsmonitor--daemon.c4
-rw-r--r--run-command.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index c69da93ece..ca60e7c849 100644
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -1208,7 +1208,7 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
* events.
*/
if (pthread_create(&state->listener_thread, NULL,
- fsm_listen__thread_proc, state) < 0) {
+ fsm_listen__thread_proc, state)) {
ipc_server_stop_async(state->ipc_server_data);
err = error(_("could not start fsmonitor listener thread"));
goto cleanup;
@@ -1219,7 +1219,7 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
* Start the health thread to watch over our process.
*/
if (pthread_create(&state->health_thread, NULL,
- fsm_health__thread_proc, state) < 0) {
+ fsm_health__thread_proc, state)) {
ipc_server_stop_async(state->ipc_server_data);
err = error(_("could not start fsmonitor health thread"));
goto cleanup;
diff --git a/run-command.c b/run-command.c
index 5ec3a46dcc..14040f0276 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1054,7 +1054,7 @@ static void *run_thread(void *data)
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGPIPE);
- if (pthread_sigmask(SIG_BLOCK, &mask, NULL) < 0) {
+ if (pthread_sigmask(SIG_BLOCK, &mask, NULL)) {
ret = error("unable to block SIGPIPE in async thread");
return (void *)ret;
}