oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ConfigData: use FatalError() instead of MPD_ERROR()

Browse Source
This commit is contained in:
Max Kellermann 2013-08-10 11:14:10 +02:00
parent 81175b0717
commit 25e338a098
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1063,6 +1063,7 @@ endif
test_read_conf_LDADD = \ test_read_conf_LDADD = \
libconf.a \ libconf.a \
libutil.a \ libutil.a \
libsystem.a \
libfs.a \ libfs.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_read_conf_SOURCES = test/read_conf.cxx test_read_conf_SOURCES = test/read_conf.cxx
@ -1076,6 +1077,7 @@ test_DumpDatabase_LDADD = \
$(DB_LIBS) \ $(DB_LIBS) \
libconf.a \ libconf.a \
libutil.a \ libutil.a \
libsystem.a \
libfs.a \ libfs.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
@ -1226,6 +1228,7 @@ test_run_filter_LDADD = \
$(FILTER_LIBS) \ $(FILTER_LIBS) \
libconf.a \ libconf.a \
libutil.a \ libutil.a \
libsystem.a \
libfs.a \ libfs.a \
$(GLIB_LIBS) $(GLIB_LIBS)
test_run_filter_SOURCES = test/run_filter.cxx \ test_run_filter_SOURCES = test/run_filter.cxx \
@ -1259,6 +1262,7 @@ test_run_encoder_LDADD = \
$(TAG_LIBS) \ $(TAG_LIBS) \
libconf.a \ libconf.a \
libpcm.a \ libpcm.a \
libsystem.a \
libfs.a \ libfs.a \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)
@ -1279,6 +1283,7 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
$(ENCODER_LIBS) \ $(ENCODER_LIBS) \
$(PCM_LIBS) \ $(PCM_LIBS) \
libconf.a \ libconf.a \
libsystem.a \
libfs.a \ libfs.a \
libutil.a \ libutil.a \
$(GLIB_LIBS) $(GLIB_LIBS)

11
src/ConfigData.cxx
View File

@ -22,6 +22,7 @@
#include "ConfigParser.hxx" #include "ConfigParser.hxx"
#include "ConfigPath.hxx" #include "ConfigPath.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "system/FatalError.hxx"
#include "mpd_error.h" #include "mpd_error.h"
#include <glib.h> #include <glib.h>
@ -36,10 +37,10 @@ block_param::GetUnsignedValue() const
char *endptr; char *endptr;
long value2 = strtol(value.c_str(), &endptr, 0); long value2 = strtol(value.c_str(), &endptr, 0);
if (*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) 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; return (unsigned)value2;
} }
@ -49,9 +50,9 @@ block_param::GetBoolValue() const
{ {
bool value2; bool value2;
if (!get_bool(value.c_str(), &value2)) if (!get_bool(value.c_str(), &value2))
MPD_ERROR("%s is not a boolean value (yes, true, 1) or " FormatFatalError("%s is not a boolean value (yes, true, 1) or "
"(no, false, 0) on line %i\n", "(no, false, 0) on line %i\n",
name.c_str(), line); name.c_str(), line);
return value2; return value2;
} }