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

config/Parser: add ParseSize()

Browse Source 
Supports suffixes such as "kB" and "MB".
This commit is contained in:
Max Kellermann
2019-05-29 22:44:05 +02:00
parent af7970337b
commit 4eb101f046
4 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Main.cxx
View File

@@ -58,6 +58,7 @@
#include "config/Defaults.hxx"
#include "config/Option.hxx"
#include "config/Domain.hxx"
#include "config/Parser.hxx"
#include "util/RuntimeError.hxx"
#include "util/ScopeExit.hxx"
@@ -280,12 +281,10 @@ initialize_decoder_and_player(Instance &instance,
param = config.GetParam(ConfigOption::AUDIO_BUFFER_SIZE);
if (param != nullptr) {
buffer_size = param->With([](const char *s){
char *test;
long tmp = strtol(s, &test, 10);
if (*test != '\0' || tmp <= 0 || tmp == LONG_MAX)
size_t result = ParseSize(s, KILOBYTE);
if (result <= 0)
throw FormatRuntimeError("buffer size \"%s\" is not a "
"positive integer", s);
size_t result = tmp * KILOBYTE;
if (result < MIN_BUFFER_SIZE) {
FormatWarning(config_domain, "buffer size %lu is too small, using %lu bytes instead",