diff options
| author | Max Kellermann <max@duempel.org> | 2013-09-03 11:28:47 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-03 11:28:47 +0200 |
| commit | 4db119c01b1c9a10a070a2b23a3d43ca2dc722c5 (patch) | |
| tree | 3f28777c86cd588df4c29569afe17d0f803fb10b /src | |
| parent | bbd711556476d5ef3510678a5e525974821803b2 (diff) | |
| download | mpd-4db119c01b1c9a10a070a2b23a3d43ca2dc722c5.tar.gz mpd-4db119c01b1c9a10a070a2b23a3d43ca2dc722c5.tar.xz mpd-4db119c01b1c9a10a070a2b23a3d43ca2dc722c5.zip | |
IOThread: use FatalError() on g_thread_create() error
New GLib versions don't fail.
Diffstat (limited to 'src')
| -rw-r--r-- | src/IOThread.cxx | 10 | ||||
| -rw-r--r-- | src/IOThread.hxx | 6 | ||||
| -rw-r--r-- | src/Main.cxx | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/IOThread.cxx b/src/IOThread.cxx index cba9c9263..f615b0491 100644 --- a/src/IOThread.cxx +++ b/src/IOThread.cxx @@ -23,6 +23,8 @@ #include "thread/Cond.hxx" #include "event/Loop.hxx" +#include <glib.h> + #include <assert.h> static struct { @@ -63,8 +65,8 @@ io_thread_init(void) io.loop = new EventLoop(); } -bool -io_thread_start(gcc_unused GError **error_r) +void +io_thread_start() { assert(io.loop != NULL); assert(io.thread == NULL); @@ -76,10 +78,8 @@ io_thread_start(gcc_unused GError **error_r) #else io.thread = g_thread_create(io_thread_func, NULL, true, error_r); if (io.thread == NULL) - return false; + FatalError(); #endif - - return true; } void diff --git a/src/IOThread.hxx b/src/IOThread.hxx index 8c6f233ab..cfa34a494 100644 --- a/src/IOThread.hxx +++ b/src/IOThread.hxx @@ -22,15 +22,13 @@ #include "gcc.h" -#include <glib.h> - class EventLoop; void io_thread_init(void); -bool -io_thread_start(GError **error_r); +void +io_thread_start(); /** * Run the I/O event loop synchronously in the current thread. This diff --git a/src/Main.cxx b/src/Main.cxx index 56f5b2c07..e724ebdb5 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -480,11 +480,7 @@ int mpd_main(int argc, char *argv[]) SignalHandlersInit(*main_loop); - if (!io_thread_start(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return EXIT_FAILURE; - } + io_thread_start(); ZeroconfInit(*main_loop); |