diff options
| author | Max Kellermann <max@duempel.org> | 2013-09-26 20:59:11 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-26 20:59:40 +0200 |
| commit | 5bc4ab899f444723dbb47915c438d7a8673ef44e (patch) | |
| tree | 7675554c68665c822ab62b3171f395cd532387e1 /src/output | |
| parent | 44faf1080c944b4b9f579e34346c0b0d56de7da2 (diff) | |
| download | mpd-5bc4ab899f444723dbb47915c438d7a8673ef44e.tar.gz mpd-5bc4ab899f444723dbb47915c438d7a8673ef44e.tar.xz mpd-5bc4ab899f444723dbb47915c438d7a8673ef44e.zip | |
*Plugin: remove redundant "line %i" from error messages
The MPD core will add this as a prefeix.
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/JackOutputPlugin.cxx | 14 | ||||
| -rw-r--r-- | src/output/ShoutOutputPlugin.cxx | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/output/JackOutputPlugin.cxx b/src/output/JackOutputPlugin.cxx index 63e46ef5a..727fba13e 100644 --- a/src/output/JackOutputPlugin.cxx +++ b/src/output/JackOutputPlugin.cxx @@ -290,16 +290,15 @@ mpd_jack_test_default_device(void) } static unsigned -parse_port_list(int line, const char *source, char **dest, Error &error) +parse_port_list(const char *source, char **dest, Error &error) { char **list = g_strsplit(source, ",", 0); unsigned n = 0; for (n = 0; list[n] != nullptr; ++n) { if (n >= MAX_PORTS) { - error.Format(config_domain, - "too many port names in line %d", - line); + error.Set(config_domain, + "too many port names"); return 0; } @@ -310,8 +309,7 @@ parse_port_list(int line, const char *source, char **dest, Error &error) if (n == 0) { error.Format(config_domain, - "at least one port name expected in line %d", - line); + "at least one port name expected"); return 0; } @@ -350,7 +348,7 @@ mpd_jack_init(const config_param ¶m, Error &error) /* configure the source ports */ value = param.GetBlockValue("source_ports", "left,right"); - jd->num_source_ports = parse_port_list(param.line, value, + jd->num_source_ports = parse_port_list(value, jd->source_ports, error); if (jd->num_source_ports == 0) return nullptr; @@ -368,7 +366,7 @@ mpd_jack_init(const config_param ¶m, Error &error) if (value != nullptr) { jd->num_destination_ports = - parse_port_list(param.line, value, + parse_port_list(value, jd->destination_ports, error); if (jd->num_destination_ports == 0) return nullptr; diff --git a/src/output/ShoutOutputPlugin.cxx b/src/output/ShoutOutputPlugin.cxx index fe271141f..836ba4b4c 100644 --- a/src/output/ShoutOutputPlugin.cxx +++ b/src/output/ShoutOutputPlugin.cxx @@ -142,8 +142,8 @@ ShoutOutput::Configure(const config_param ¶m, Error &error) if (*test != '\0' || quality < -1.0 || quality > 10.0) { error.Format(config_domain, "shout quality \"%s\" is not a number in the " - "range -1 to 10, line %i", - value, param.line); + "range -1 to 10", + value); return false; } |