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/decoder/mikmod_decoder_plugin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/mikmod_decoder_plugin.c b/src/decoder/mikmod_decoder_plugin.c index 50b46f2a..91478e86 100644 --- a/src/decoder/mikmod_decoder_plugin.c +++ b/src/decoder/mikmod_decoder_plugin.c @@ -19,6 +19,7 @@ #include "config.h" #include "decoder_api.h" +#include "mpd_error.h" #include #include @@ -110,8 +111,8 @@ mikmod_decoder_init(const struct config_param *param) mikmod_sample_rate = config_get_block_unsigned(param, "sample_rate", 44100); if (!audio_valid_sample_rate(mikmod_sample_rate)) - g_error("Invalid sample rate in line %d: %u", - param->line, mikmod_sample_rate); + MPD_ERROR("Invalid sample rate in line %d: %u", + param->line, mikmod_sample_rate); md_device = 0; md_reverb = 0; -- cgit v1.2.3