chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: add sd_rtnl_message_{new_neigh,neigh_get_{family,ifindex}}
[elogind.git]
/
src
/
sysctl
/
sysctl.c
diff --git
a/src/sysctl/sysctl.c
b/src/sysctl/sysctl.c
index edebe501d198bb2f051983d66c3f92d3f5b98764..973e67e3c8989a9c550bbc7aabf8ecc81843682b 100644
(file)
--- a/
src/sysctl/sysctl.c
+++ b/
src/sysctl/sysctl.c
@@
-134,8
+134,7
@@
static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
- return r;
+ return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
}
log_debug("parse: %s", path);
}
log_debug("parse: %s", path);
@@
-148,7
+147,7
@@
static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
if (feof(f))
break;
if (feof(f))
break;
- log_error
(
"Failed to read file '%s', ignoring: %m", path);
+ log_error
_errno(errno,
"Failed to read file '%s', ignoring: %m", path);
return -errno;
}
return -errno;
}
@@
-196,7
+195,7
@@
static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
k = hashmap_put(sysctl_options, property, new_value);
if (k < 0) {
k = hashmap_put(sysctl_options, property, new_value);
if (k < 0) {
- log_error
("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-k)
);
+ log_error
_errno(k, "Failed to add sysctl variable %s to hashmap: %m", property
);
free(property);
free(new_value);
return k;
free(property);
free(new_value);
return k;
@@
-314,7
+313,7
@@
int main(int argc, char *argv[]) {
r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (r < 0) {
r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (r < 0) {
- log_error
("Failed to enumerate sysctl.d files: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to enumerate sysctl.d files: %m"
);
goto finish;
}
goto finish;
}