chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: order local addresses/gateways by the address itself as last resort
[elogind.git]
/
src
/
binfmt
/
binfmt.c
diff --git
a/src/binfmt/binfmt.c
b/src/binfmt/binfmt.c
index ca650fb00903ef40bb8a957045b107ecfc17ec7d..089b7754a431b6cc4e9cff611b7ad0f06fa80b9e 100644
(file)
--- a/
src/binfmt/binfmt.c
+++ b/
src/binfmt/binfmt.c
@@
-64,10
+64,8
@@
static int apply_rule(const char *rule) {
delete_rule(rule);
r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule);
delete_rule(rule);
r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule);
- if (r < 0) {
- log_error_errno(-r, "Failed to add binary format: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add binary format: %m");
return 0;
}
return 0;
}
@@
-83,8
+81,7
@@
static int apply_file(const char *path, bool ignore_enoent) {
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to open file '%s', ignoring: %m", path);
- return r;
+ return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
}
log_debug("apply: %s", path);
}
log_debug("apply: %s", path);
@@
-96,7
+93,7
@@
static int apply_file(const char *path, bool ignore_enoent) {
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;
}
@@
-191,7
+188,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_errno(
-
r, "Failed to enumerate binfmt.d files: %m");
+ log_error_errno(r, "Failed to enumerate binfmt.d files: %m");
goto finish;
}
goto finish;
}