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/replay_gain_config.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 '')
| -rw-r--r-- | src/replay_gain_config.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/replay_gain_config.c b/src/replay_gain_config.c index f82725e90..bbfe127a7 100644 --- a/src/replay_gain_config.c +++ b/src/replay_gain_config.c @@ -22,6 +22,7 @@ #include "playlist.h" #include "conf.h" #include "idle.h" +#include "mpd_error.h" #include <glib.h> @@ -91,8 +92,8 @@ void replay_gain_global_init(void) const struct config_param *param = config_get_param(CONF_REPLAYGAIN); if (param != NULL && !replay_gain_set_mode_string(param->value)) { - g_error("replaygain value \"%s\" at line %i is invalid\n", - param->value, param->line); + MPD_ERROR("replaygain value \"%s\" at line %i is invalid\n", + param->value, param->line); } param = config_get_param(CONF_REPLAYGAIN_PREAMP); @@ -102,13 +103,13 @@ void replay_gain_global_init(void) float f = strtod(param->value, &test); if (*test != '\0') { - g_error("Replaygain preamp \"%s\" is not a number at " - "line %i\n", param->value, param->line); + MPD_ERROR("Replaygain preamp \"%s\" is not a number at " + "line %i\n", param->value, param->line); } if (f < -15 || f > 15) { - g_error("Replaygain preamp \"%s\" is not between -15 and" - "15 at line %i\n", param->value, param->line); + MPD_ERROR("Replaygain preamp \"%s\" is not between -15 and" + "15 at line %i\n", param->value, param->line); } replay_gain_preamp = pow(10, f / 20.0); @@ -121,13 +122,13 @@ void replay_gain_global_init(void) float f = strtod(param->value, &test); if (*test != '\0') { - g_error("Replaygain missing preamp \"%s\" is not a number at " - "line %i\n", param->value, param->line); + MPD_ERROR("Replaygain missing preamp \"%s\" is not a number at " + "line %i\n", param->value, param->line); } if (f < -15 || f > 15) { - g_error("Replaygain missing preamp \"%s\" is not between -15 and" - "15 at line %i\n", param->value, param->line); + MPD_ERROR("Replaygain missing preamp \"%s\" is not between -15 and" + "15 at line %i\n", param->value, param->line); } replay_gain_missing_preamp = pow(10, f / 20.0); |