diff options
author | Thomas Jansen <mithi@mithi.net> | 2010-09-25 15:00:43 +0200 |
---|---|---|
committer | Thomas Jansen <mithi@mithi.net> | 2010-09-25 15:00:43 +0200 |
commit | 28bcb8bdf568875eeea1349e39b7958d77c8fcc1 (patch) | |
tree | 17397be16e8067a48fd532a581081f68a1b17700 /src/inotify_source.c | |
parent | 9af9fd140032138894e4781caabee8a5a96edab8 (diff) | |
download | mpd-28bcb8bdf568875eeea1349e39b7958d77c8fcc1.tar.gz mpd-28bcb8bdf568875eeea1349e39b7958d77c8fcc1.tar.xz mpd-28bcb8bdf568875eeea1349e39b7958d77c8fcc1.zip |
eliminate g_error() usage
Replaced all occurrences of g_error() with MPD_ERROR() located in a new header
file 'mpd_error.h'. This macro uses g_critical() to print the error message
and then exits gracefully in contrast to g_error() which would internally call
abort() to produce a core dump.
The macro name is distinctive and allows to find all places with dubious error
handling. The long-term goal is to get rid of MPD_ERROR() altogether. To
facilitate the eventual removal of this macro it was added in a new header
file rather than to an existing header file.
This fixes #2995 and #3007.
Diffstat (limited to 'src/inotify_source.c')
-rw-r--r-- | src/inotify_source.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/inotify_source.c b/src/inotify_source.c index d4b047fe1..3a986cbad 100644 --- a/src/inotify_source.c +++ b/src/inotify_source.c @@ -21,6 +21,7 @@ #include "inotify_source.h" #include "fifo_buffer.h" #include "fd_util.h" +#include "mpd_error.h" #include <sys/inotify.h> #include <unistd.h> @@ -68,13 +69,14 @@ mpd_inotify_in_event(G_GNUC_UNUSED GIOChannel *_source, dest = fifo_buffer_write(source->buffer, &length); if (dest == NULL) - g_error("buffer full"); + MPD_ERROR("buffer full"); nbytes = read(source->fd, dest, length); if (nbytes < 0) - g_error("failed to read from inotify: %s", g_strerror(errno)); + MPD_ERROR("failed to read from inotify: %s", + g_strerror(errno)); if (nbytes == 0) - g_error("end of file from inotify"); + MPD_ERROR("end of file from inotify"); fifo_buffer_append(source->buffer, nbytes); |