diff options
| author | J. Alexander Treuman <jat@spatialrift.net> | 2006-07-21 17:20:38 +0000 |
|---|---|---|
| committer | J. Alexander Treuman <jat@spatialrift.net> | 2006-07-21 17:20:38 +0000 |
| commit | 6dbacc71c7a9bcea220801e877e46ee2916a1759 (patch) | |
| tree | 39b2460b660e9ae6b23f1ff73ab953da8e76f76b | |
| parent | ac7ef037b520cfe961942aa2f18a75c6408a7150 (diff) | |
| download | mpd-6dbacc71c7a9bcea220801e877e46ee2916a1759.tar.gz mpd-6dbacc71c7a9bcea220801e877e46ee2916a1759.tar.xz mpd-6dbacc71c7a9bcea220801e877e46ee2916a1759.zip | |
Make getBoolConfigParam and save_absolute_paths_in_playlist less stupid
git-svn-id: https://svn.musicpd.org/mpd/trunk@4419 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/conf.c | 2 | ||||
| -rw-r--r-- | src/playlist.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/conf.c b/src/conf.c index 2a5ea9e5f..2a0ab2077 100644 --- a/src/conf.c +++ b/src/conf.c @@ -372,7 +372,7 @@ int getBoolConfigParam(char *name) if (strcmp("yes", param->value) == 0) return 1; else if (strcmp("no", param->value) == 0) return 0; - return -1; + return -2; } BlockParam *getBlockParam(ConfigParam * param, char *name) diff --git a/src/playlist.c b/src/playlist.c index c7ef9d17f..fce6cfe3b 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -167,7 +167,14 @@ void initPlaylist(void) } playlist_saveAbsolutePaths = getBoolConfigParam(CONF_SAVE_ABSOLUTE_PATHS); - playlist_saveAbsolutePaths = playlist_saveAbsolutePaths < 0 ? 0 : playlist_saveAbsolutePaths; + if (playlist_saveAbsolutePaths == -1) playlist_saveAbsolutePaths = 0; + else if (playlist_saveAbsolutePaths < 0) { + param = getConfigParam(CONF_SAVE_ABSOLUTE_PATHS); + ERROR("%s is not \"yes\" or \"no\" on line %i\n" + CONF_SAVE_ABSOLUTE_PATHS, + param->value, param->line); + exit(EXIT_FAILURE); + } playlist.songs = malloc(sizeof(Song *) * playlist_max_length); playlist.songMod = malloc(sizeof(mpd_uint32) * playlist_max_length); |