diff options
| author | Denis Krjuchkov <alcohold@gmail.com> | 2010-09-26 13:40:30 +0600 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-09-28 18:12:14 +0200 |
| commit | 2b78358af5b883c7fefc2b22b2693c5e4af6e1d3 (patch) | |
| tree | efe252d494810c02e046855d8858fdc6e0120c38 | |
| parent | a59ab3e2ee4407a1c912cdf0d2e09f8670cc3ffe (diff) | |
| download | mpd-2b78358af5b883c7fefc2b22b2693c5e4af6e1d3.tar.gz mpd-2b78358af5b883c7fefc2b22b2693c5e4af6e1d3.tar.xz mpd-2b78358af5b883c7fefc2b22b2693c5e4af6e1d3.zip | |
mpd_error: more correct MPD_ERROR implementation
Original implementation does not handle
if (...)
MPD_ERROR("die");
else
...
case well. This change fixes handling of such cases.
| -rw-r--r-- | src/mpd_error.h | 4 | ||||
| -rw-r--r-- | src/output_all.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mpd_error.h b/src/mpd_error.h index 95e120572..47618d03c 100644 --- a/src/mpd_error.h +++ b/src/mpd_error.h @@ -28,9 +28,9 @@ * proper error handling. */ #define MPD_ERROR(...) \ - { \ + do { \ g_critical(__VA_ARGS__); \ exit(EXIT_FAILURE); \ - } + } while(0) #endif diff --git a/src/output_all.c b/src/output_all.c index 3f582dcb4..2c43d9f5a 100644 --- a/src/output_all.c +++ b/src/output_all.c @@ -124,7 +124,7 @@ audio_output_all_init(void) if (!audio_output_init(output, param, &error)) { if (param != NULL) MPD_ERROR("line %i: %s", - param->line, error->message) + param->line, error->message); else MPD_ERROR("%s", error->message); } |