aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmdline.c
diff options
context:
space:
mode:
authorThomas Jansen <mithi@mithi.net>2010-09-25 15:00:43 +0200
committerThomas Jansen <mithi@mithi.net>2010-09-25 15:00:43 +0200
commit28bcb8bdf568875eeea1349e39b7958d77c8fcc1 (patch)
tree17397be16e8067a48fd532a581081f68a1b17700 /src/cmdline.c
parent9af9fd140032138894e4781caabee8a5a96edab8 (diff)
downloadmpd-28bcb8bdf568875eeea1349e39b7958d77c8fcc1.tar.gz
mpd-28bcb8bdf568875eeea1349e39b7958d77c8fcc1.tar.xz
mpd-28bcb8bdf568875eeea1349e39b7958d77c8fcc1.zip
eliminate g_error() usage
Replaced all occurrences of g_error() with MPD_ERROR() located in a new header file 'mpd_error.h'. This macro uses g_critical() to print the error message and then exits gracefully in contrast to g_error() which would internally call abort() to produce a core dump. The macro name is distinctive and allows to find all places with dubious error handling. The long-term goal is to get rid of MPD_ERROR() altogether. To facilitate the eventual removal of this macro it was added in a new header file rather than to an existing header file. This fixes #2995 and #3007.
Diffstat (limited to '')
-rw-r--r--src/cmdline.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cmdline.c b/src/cmdline.c
index 747d7c3bb..2c1db890b 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -26,6 +26,7 @@
#include "decoder_plugin.h"
#include "output_list.h"
#include "ls.h"
+#include "mpd_error.h"
#ifdef ENABLE_ENCODER
#include "encoder_list.h"
@@ -155,10 +156,8 @@ parse_cmdline(int argc, char **argv, struct options *options,
ret = g_option_context_parse(context, &argc, &argv, &error);
g_option_context_free(context);
- if (!ret) {
- g_error("option parsing failed: %s\n", error->message);
- exit(1);
- }
+ if (!ret)
+ MPD_ERROR("option parsing failed: %s\n", error->message);
if (option_version)
version();