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/audio.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/audio.c')
| -rw-r--r-- | src/audio.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/audio.c b/src/audio.c index 92d688f38..912e46ffa 100644 --- a/src/audio.c +++ b/src/audio.c @@ -127,23 +127,21 @@ void initAudioDriver(void) if (!initAudioOutput(output, param)) { if (param) { - ERROR("problems configuring output device " + FATAL("problems configuring output device " "defined at line %i\n", param->line); } else { - ERROR("No audio_output specified and unable to " + FATAL("No audio_output specified and unable to " "detect a default audio output device\n"); } - exit(EXIT_FAILURE); } /* require output names to be unique: */ for (j = 0; j < i; j++) { if (!strcmp(output->name, audioOutputArray[j].name)) { - ERROR("output devices with identical " + FATAL("output devices with identical " "names: %s\n", output->name); - exit(EXIT_FAILURE); } } audioDeviceStates[i] = DEVICE_ENABLE; @@ -169,9 +167,8 @@ void initAudioConfig(void) audio_configFormat = xmalloc(sizeof(AudioFormat)); if (0 != parseAudioConfig(audio_configFormat, param->value)) { - ERROR("error parsing \"%s\" at line %i\n", + FATAL("error parsing \"%s\" at line %i\n", CONF_AUDIO_OUTPUT_FORMAT, param->line); - exit(EXIT_FAILURE); } } |