oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mpd_error: more correct MPD_ERROR implementation

Browse Source 
Original implementation does not handle
	if (...)
		MPD_ERROR("die");
	else
		...
case well. This change fixes handling of such cases.
This commit is contained in:
Denis Krjuchkov 2010-09-26 13:40:30 +06:00 committed by Max Kellermann
parent a59ab3e2ee
commit 2b78358af5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mpd_error.h
View File

@ -28,9 +28,9 @@
* proper error handling. */ * proper error handling. */
#define MPD_ERROR(...) \ #define MPD_ERROR(...) \
{ \ do { \
g_critical(__VA_ARGS__); \ g_critical(__VA_ARGS__); \
exit(EXIT_FAILURE); \ exit(EXIT_FAILURE); \
} } while(0)
#endif #endif

2
src/output_all.c
View File

@ -124,7 +124,7 @@ audio_output_all_init(void)
if (!audio_output_init(output, param, &error)) { if (!audio_output_init(output, param, &error)) {
if (param != NULL) if (param != NULL)
MPD_ERROR("line %i: %s", MPD_ERROR("line %i: %s",
param->line, error->message) param->line, error->message);
else else
MPD_ERROR("%s", error->message); MPD_ERROR("%s", error->message);
} }