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/pcm_mix.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/pcm_mix.c') diff --git a/src/pcm_mix.c b/src/pcm_mix.c index 33815dac2..3145c07be 100644 --- a/src/pcm_mix.c +++ b/src/pcm_mix.c @@ -22,6 +22,7 @@ #include "pcm_volume.h" #include "pcm_utils.h" #include "audio_format.h" +#include "mpd_error.h" #include @@ -125,8 +126,8 @@ pcm_add_vol(void *buffer1, const void *buffer2, size_t size, break; default: - g_error("format %s not supported by pcm_add_vol", - sample_format_to_string(format->format)); + MPD_ERROR("format %s not supported by pcm_add_vol", + sample_format_to_string(format->format)); } } @@ -208,8 +209,8 @@ pcm_add(void *buffer1, const void *buffer2, size_t size, break; default: - g_error("format %s not supported by pcm_add", - sample_format_to_string(format->format)); + MPD_ERROR("format %s not supported by pcm_add", + sample_format_to_string(format->format)); } } -- cgit v1.2.3