diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | src/ConfigData.cxx | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index c4dc716c7..957124b0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1063,6 +1063,7 @@ endif test_read_conf_LDADD = \ libconf.a \ libutil.a \ + libsystem.a \ libfs.a \ $(GLIB_LIBS) test_read_conf_SOURCES = test/read_conf.cxx @@ -1076,6 +1077,7 @@ test_DumpDatabase_LDADD = \ $(DB_LIBS) \ libconf.a \ libutil.a \ + libsystem.a \ libfs.a \ $(GLIB_LIBS) test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ @@ -1226,6 +1228,7 @@ test_run_filter_LDADD = \ $(FILTER_LIBS) \ libconf.a \ libutil.a \ + libsystem.a \ libfs.a \ $(GLIB_LIBS) test_run_filter_SOURCES = test/run_filter.cxx \ @@ -1259,6 +1262,7 @@ test_run_encoder_LDADD = \ $(TAG_LIBS) \ libconf.a \ libpcm.a \ + libsystem.a \ libfs.a \ libutil.a \ $(GLIB_LIBS) @@ -1279,6 +1283,7 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \ $(ENCODER_LIBS) \ $(PCM_LIBS) \ libconf.a \ + libsystem.a \ libfs.a \ libutil.a \ $(GLIB_LIBS) diff --git a/src/ConfigData.cxx b/src/ConfigData.cxx index 12aa9f69f..eab5f0ed4 100644 --- a/src/ConfigData.cxx +++ b/src/ConfigData.cxx @@ -22,6 +22,7 @@ #include "ConfigParser.hxx" #include "ConfigPath.hxx" #include "fs/Path.hxx" +#include "system/FatalError.hxx" #include "mpd_error.h" #include <glib.h> @@ -36,10 +37,10 @@ block_param::GetUnsignedValue() const char *endptr; long value2 = strtol(value.c_str(), &endptr, 0); if (*endptr != 0) - MPD_ERROR("Not a valid number in line %i", line); + FormatFatalError("Not a valid number in line %i", line); if (value2 < 0) - MPD_ERROR("Not a positive number in line %i", line); + FormatFatalError("Not a positive number in line %i", line); return (unsigned)value2; } @@ -49,9 +50,9 @@ block_param::GetBoolValue() const { bool value2; if (!get_bool(value.c_str(), &value2)) - MPD_ERROR("%s is not a boolean value (yes, true, 1) or " - "(no, false, 0) on line %i\n", - name.c_str(), line); + FormatFatalError("%s is not a boolean value (yes, true, 1) or " + "(no, false, 0) on line %i\n", + name.c_str(), line); return value2; } |