chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: clarify that we really need to replace the utab inotify code with the native...
[elogind.git]
/
src
/
journal
/
coredumpctl.c
diff --git
a/src/journal/coredumpctl.c
b/src/journal/coredumpctl.c
index 7e87f5f21dc24a759891b40cc9b54b01619d0991..a6551ac44b21a027e26c91c51d0d0168f5138996 100644
(file)
--- a/
src/journal/coredumpctl.c
+++ b/
src/journal/coredumpctl.c
@@
-190,10
+190,8
@@
static int parse_argv(int argc, char *argv[], Set *matches) {
}
output = fopen(optarg, "we");
}
output = fopen(optarg, "we");
- if (!output) {
- log_error("writing to '%s': %m", optarg);
- return -errno;
- }
+ if (!output)
+ return log_error_errno(errno, "writing to '%s': %m", optarg);
break;
break;
@@
-609,10
+607,8
@@
static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
return log_oom();
fdt = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC);
return log_oom();
fdt = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC);
- if (fdt < 0) {
- log_error("Failed to create temporary file: %m");
- return -errno;
- }
+ if (fdt < 0)
+ return log_error_errno(errno, "Failed to create temporary file: %m");
log_debug("Created temporary file %s", temp);
fd = fdt;
log_debug("Created temporary file %s", temp);
fd = fdt;
@@
-628,7
+624,7
@@
static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
sz = write(fdt, data, len);
if (sz < 0) {
sz = write(fdt, data, len);
if (sz < 0) {
- log_error
(
"Failed to write temporary file: %m");
+ log_error
_errno(errno,
"Failed to write temporary file: %m");
r = -errno;
goto error;
}
r = -errno;
goto error;
}
@@
-643,7
+639,7
@@
static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
fdf = open(filename, O_RDONLY | O_CLOEXEC);
if (fdf < 0) {
fdf = open(filename, O_RDONLY | O_CLOEXEC);
if (fdf < 0) {
- log_error
(
"Failed to open %s: %m", filename);
+ log_error
_errno(errno,
"Failed to open %s: %m", filename);
r = -errno;
goto error;
}
r = -errno;
goto error;
}
@@
-755,20
+751,20
@@
static int run_gdb(sd_journal *j) {
pid = fork();
if (pid < 0) {
pid = fork();
if (pid < 0) {
- log_error
(
"Failed to fork(): %m");
+ log_error
_errno(errno,
"Failed to fork(): %m");
r = -errno;
goto finish;
}
if (pid == 0) {
execlp("gdb", "gdb", exe, path, NULL);
r = -errno;
goto finish;
}
if (pid == 0) {
execlp("gdb", "gdb", exe, path, NULL);
- log_error
(
"Failed to invoke gdb: %m");
+ log_error
_errno(errno,
"Failed to invoke gdb: %m");
_exit(1);
}
r = wait_for_terminate(pid, &st);
if (r < 0) {
_exit(1);
}
r = wait_for_terminate(pid, &st);
if (r < 0) {
- log_error
(
"Failed to wait for gdb: %m");
+ log_error
_errno(errno,
"Failed to wait for gdb: %m");
goto finish;
}
goto finish;
}