X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=thread.cpp;h=473c71a82110821745ce176b8d4259c77375d66a;hb=f0621e41fdb96ce1bd58e7561e0aa76345072ba3;hp=bd4cfd1790288e6dcb712820b3bc6725b9548732;hpb=3fd8650ccf3da3960a946d8ac9abc305aec399ce;p=cubemap

diff --git a/thread.cpp b/thread.cpp
index bd4cfd1..473c71a 100644
--- a/thread.cpp
+++ b/thread.cpp
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
@@ -15,9 +14,9 @@ Thread::~Thread() {}
 
 void Thread::run()
 {
-	pthread_mutex_init(&should_stop_mutex, NULL);
+	pthread_mutex_init(&should_stop_mutex, nullptr);
 	should_stop_status = false;
-	pthread_create(&worker_thread, NULL, &Thread::do_work_thunk, this);
+	pthread_create(&worker_thread, nullptr, &Thread::do_work_thunk, this);
 }
 
 void Thread::stop()
@@ -27,7 +26,7 @@ void Thread::stop()
 		should_stop_status = true;
 	}
 	wakeup();
-	if (pthread_join(worker_thread, NULL) == -1) {
+	if (pthread_join(worker_thread, nullptr) == -1) {
 		log_perror("pthread_join");
 		exit(1);
 	}
@@ -41,8 +40,9 @@ void *Thread::do_work_thunk(void *arg)
 	// (This isn't strictly required, but it makes it easier to debug that indeed
 	// SIGUSR1 was what woke us up.)
 	sigset_t set;
+	sigemptyset(&set);
 	sigaddset(&set, SIGHUP);
-	int err = pthread_sigmask(SIG_BLOCK, &set, NULL);
+	int err = pthread_sigmask(SIG_BLOCK, &set, nullptr);
 	if (err != 0) {
 		errno = err;
 		log_perror("pthread_sigmask");
@@ -61,7 +61,7 @@ void *Thread::do_work_thunk(void *arg)
 
 	// Call the right thunk.
 	thread->do_work();
-	return NULL;
+	return nullptr;
 }
 
 bool Thread::wait_for_activity(int fd, short events, const struct timespec *timeout_ts)