summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-16 18:27:12 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-16 18:47:20 -0400
commit36f822c4bd077f9121757e24b6516e5c7ada63b5 (patch)
tree9201ba3d895aa08a00c17ada422a3dd399e456f9 /src/udev
parente1bbf3d12f28b8e3d4394f2b257e1b7aea3d10fc (diff)
Let config_parse open file where applicable
Special care is needed so that we get an error message if the file failed to parse, but not when it is missing. To avoid duplicating the same error check in every caller, add an additional 'warn' boolean to tell config_parse whether a message should be issued. This makes things both shorter and more robust wrt. to error reporting.
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/net/link-config.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index fe916a4326..73243fa107 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -177,11 +177,10 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
r = config_parse(NULL, filename, file,
"Match\0Link\0Ethernet\0",
config_item_perf_lookup, link_config_gperf_lookup,
- false, false, link);
- if (r < 0) {
- log_warning("Could not parse config file %s: %s", filename, strerror(-r));
+ false, false, true, link);
+ if (r < 0)
return r;
- } else
+ else
log_debug("Parsed configuration file %s", filename);
link->filename = strdup(filename);