diff options
| author | J. Alexander Treuman <jat@spatialrift.net> | 2007-05-26 18:15:54 +0000 |
|---|---|---|
| committer | J. Alexander Treuman <jat@spatialrift.net> | 2007-05-26 18:15:54 +0000 |
| commit | bba444524eca700970f69261bc470fb01a138222 (patch) | |
| tree | 7d5e302586ed757a6eb3f71a27f84bba60383fd4 /src/audioOutput.c | |
| parent | dba45a59928301da0faa4ec679eb1a3a81d5fba5 (diff) | |
| download | mpd-bba444524eca700970f69261bc470fb01a138222.tar.gz mpd-bba444524eca700970f69261bc470fb01a138222.tar.xz mpd-bba444524eca700970f69261bc470fb01a138222.zip | |
Changing all calls to ERROR() followed by exit(EXIT_FAILURE) with a single
call to FATAL().
git-svn-id: https://svn.musicpd.org/mpd/trunk@6276 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audioOutput.c')
| -rw-r--r-- | src/audioOutput.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/audioOutput.c b/src/audioOutput.c index 9f6172088..49a7ce258 100644 --- a/src/audioOutput.c +++ b/src/audioOutput.c @@ -58,10 +58,9 @@ void finishAudioOutputPlugins(void) #define getBlockParam(name, str, force) { \ bp = getBlockParam(param, name); \ if(force && bp == NULL) { \ - ERROR("couldn't find parameter \"%s\" in audio output " \ + FATAL("couldn't find parameter \"%s\" in audio output " \ "definition beginning at %i\n", \ name, param->line); \ - exit(EXIT_FAILURE); \ } \ if(bp) str = bp->value; \ } @@ -81,9 +80,8 @@ int initAudioOutput(AudioOutput *ao, ConfigParam * param) getBlockParam(AUDIO_OUTPUT_FORMAT, format, 0); if (!findInList(audioOutputPluginList, type, &data)) { - ERROR("couldn't find audio output plugin for type " + FATAL("couldn't find audio output plugin for type " "\"%s\" at line %i\n", type, param->line); - exit(EXIT_FAILURE); } plugin = (AudioOutputPlugin *) data; @@ -141,8 +139,7 @@ int initAudioOutput(AudioOutput *ao, ConfigParam * param) ao->convertAudioFormat = 1; if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) { - ERROR("error parsing format at line %i\n", bp->line); - exit(EXIT_FAILURE); + FATAL("error parsing format at line %i\n", bp->line); } copyAudioFormat(&ao->outAudioFormat, &ao->reqAudioFormat); |