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

ConfigData: Add support for signed integers

Browse Source 
Now config_param::GetBlockValue() can be used to get signed integers
from the configuration.
This commit is contained in:
Sebastian Thorarensen 2013-10-19 15:38:50 +02:00 committed by Max Kellermann
parent fc9014f7ec
commit d6553fc6a7
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ConfigData.cxx
View File

@ -29,6 +29,17 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
int
block_param::GetIntValue() const
{
char *endptr;
long value2 = strtol(value.c_str(), &endptr, 0);
if (*endptr != 0)
FormatFatalError("Not a valid number in line %i", line);
return value2;
}
unsigned unsigned
block_param::GetUnsignedValue() const block_param::GetUnsignedValue() const
{ {
@ -120,6 +131,16 @@ config_param::GetBlockPath(const char *name, Error &error) const
return GetBlockPath(name, nullptr, error); return GetBlockPath(name, nullptr, error);
} }
int
config_param::GetBlockValue(const char *name, int default_value) const
{
const block_param *bp = GetBlockParam(name);
if (bp == nullptr)
return default_value;
return bp->GetIntValue();
}
unsigned unsigned
config_param::GetBlockValue(const char *name, unsigned default_value) const config_param::GetBlockValue(const char *name, unsigned default_value) const
{ {

6
src/ConfigData.hxx
View File

@ -45,6 +45,9 @@ struct block_param {
block_param(const char *_name, const char *_value, int _line=-1) block_param(const char *_name, const char *_value, int _line=-1)
:name(_name), value(_value), line(_line), used(false) {} :name(_name), value(_value), line(_line), used(false) {}
gcc_pure
int GetIntValue() const;
gcc_pure gcc_pure
unsigned GetUnsignedValue() const; unsigned GetUnsignedValue() const;
@ -114,6 +117,9 @@ struct config_param {
AllocatedPath GetBlockPath(const char *name, Error &error) const; AllocatedPath GetBlockPath(const char *name, Error &error) const;
gcc_pure
int GetBlockValue(const char *name, int default_value) const;
gcc_pure gcc_pure
unsigned GetBlockValue(const char *name, unsigned default_value) const; unsigned GetBlockValue(const char *name, unsigned default_value) const;