aboutsummaryrefslogtreecommitdiffstats
path: root/src/permission.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/permission.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/permission.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/permission.c b/src/permission.c
index ce47effe8..17b443e0a 100644
--- a/src/permission.c
+++ b/src/permission.c
@@ -20,6 +20,7 @@
#include "config.h"
#include "permission.h"
#include "conf.h"
+#include "mpd_error.h"
#include <glib.h>
@@ -59,7 +60,7 @@ static unsigned parsePermissions(const char *string)
} else if (strcmp(temp, PERMISSION_ADMIN_STRING) == 0) {
permission |= PERMISSION_ADMIN;
} else {
- g_error("unknown permission \"%s\"", temp);
+ MPD_ERROR("unknown permission \"%s\"", temp);
}
}
@@ -90,7 +91,7 @@ void initPermissions(void)
strchr(param->value, PERMISSION_PASSWORD_CHAR);
if (separator == NULL)
- g_error("\"%c\" not found in password string "
+ MPD_ERROR("\"%c\" not found in password string "
"\"%s\", line %i",
PERMISSION_PASSWORD_CHAR,
param->value, param->line);