chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coredump: Support coredump.conf.d directories in the usual search paths
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 2fdbeeae81e38c66b751a533301a6256e5d8a792..99305716ed7a30998a255238ce44a23ea4e4e4ae 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-159,7
+159,7
@@
static int notify_override_unchanged(const char *f) {
static int found_override(const char *top, const char *bottom) {
_cleanup_free_ char *dest = NULL;
static int found_override(const char *top, const char *bottom) {
_cleanup_free_ char *dest = NULL;
- int k
, r
;
+ int k;
pid_t pid;
assert(top);
pid_t pid;
assert(top);
@@
-185,19
+185,15
@@
static int found_override(const char *top, const char *bottom) {
fflush(stdout);
pid = fork();
fflush(stdout);
pid = fork();
- if (pid < 0) {
- log_error("Failed to fork off diff: %m");
- return -errno;
- } else if (pid == 0) {
+ if (pid < 0)
+ return log_error_errno(errno, "Failed to fork off diff: %m");
+ else if (pid == 0) {
execlp("diff", "diff", "-us", "--", bottom, top, NULL);
execlp("diff", "diff", "-us", "--", bottom, top, NULL);
- log_error
(
"Failed to execute diff: %m");
+ log_error
_errno(errno,
"Failed to execute diff: %m");
_exit(1);
}
_exit(1);
}
- r = wait_for_terminate(pid, NULL);
- if (r < 0)
- log_warning("Failed to wait for diff: %s", strerror(-r));
-
+ wait_for_terminate_and_warn("diff", pid, false);
putchar('\n');
return k;
putchar('\n');
return k;
@@
-229,10
+225,8
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
*c = 0;
r = get_files_in_directory(path, &list);
*c = 0;
r = get_files_in_directory(path, &list);
- if (r < 0){
- log_error("Failed to enumerate %s: %s", path, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to enumerate %s: %m", path);
STRV_FOREACH(file, list) {
Hashmap *h;
STRV_FOREACH(file, list) {
Hashmap *h;
@@
-310,7
+304,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
- log_error
(
"Failed to open %s: %m", path);
+ log_error
_errno(errno,
"Failed to open %s: %m", path);
return -errno;
}
return -errno;
}