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.

mpd_error: more correct MPD_ERROR implementation
2b78358a · Denis Krjuchkov · Max Kellermann · a59ab3e2 · 2b78358a · 2b78358a
Commit 2b78358a authored Sep 26, 2010 by Denis Krjuchkov Committed by Max Kellermann Sep 28, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mpd_error.h src/mpd_error.h +2 -2

output_all.c src/output_all.c +1 -1

No files found.
--- 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
--- 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);
 		}