From 28bcb8bdf568875eeea1349e39b7958d77c8fcc1 Mon Sep 17 00:00:00 2001 From: Thomas Jansen Date: Sat, 25 Sep 2010 15:00:43 +0200 Subject: 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. --- src/inotify_source.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/inotify_source.c') 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 #include @@ -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); -- cgit v1.2.3