diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-17 20:23:58 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-17 20:23:58 +0100 |
| commit | 0b29a22c088462f2d2c0fba8363423bd2ab41f1a (patch) | |
| tree | 136eb8698c082242e896a71bfaa33e5138e026a6 /src/database.c | |
| parent | 7acc62366cb59aba414821563cc89e01e96c1987 (diff) | |
| download | mpd-0b29a22c088462f2d2c0fba8363423bd2ab41f1a.tar.gz mpd-0b29a22c088462f2d2c0fba8363423bd2ab41f1a.tar.xz mpd-0b29a22c088462f2d2c0fba8363423bd2ab41f1a.zip | |
conf: replaced getConfigParamValue() with config_get_string()
Don't return a writable pointer.
Diffstat (limited to 'src/database.c')
| -rw-r--r-- | src/database.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/database.c b/src/database.c index 46c09281f..cb9d92819 100644 --- a/src/database.c +++ b/src/database.c @@ -281,7 +281,7 @@ db_load(void) foundVersion = true; } else if (g_str_has_prefix(buffer, DIRECTORY_FS_CHARSET)) { char *fsCharset; - char *tempCharset; + const char *tempCharset; if (foundFsCharset) g_error("already found fs charset in db"); @@ -289,7 +289,8 @@ db_load(void) foundFsCharset = true; fsCharset = &(buffer[strlen(DIRECTORY_FS_CHARSET)]); - if ((tempCharset = getConfigParamValue(CONF_FS_CHARSET)) + tempCharset = config_get_string(CONF_FS_CHARSET, NULL); + if (tempCharset != NULL && strcmp(fsCharset, tempCharset)) { g_message("Using \"%s\" for the " "filesystem charset " |