chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: various simplifications
[elogind.git]
/
src
/
journal
/
cat.c
diff --git
a/src/journal/cat.c
b/src/journal/cat.c
index 627c0624a5064b26260b904b1f26572418e1ebfa..79706b692dd48ed3840ceab74e9ee81565fad1af 100644
(file)
--- a/
src/journal/cat.c
+++ b/
src/journal/cat.c
@@
-134,7
+134,7
@@
int main(int argc, char *argv[]) {
fd = sd_journal_stream_fd(arg_identifier, arg_priority, arg_level_prefix);
if (fd < 0) {
fd = sd_journal_stream_fd(arg_identifier, arg_priority, arg_level_prefix);
if (fd < 0) {
- log_error
("Failed to create stream fd: %s", strerror(-fd)
);
+ log_error
_errno(fd, "Failed to create stream fd: %m"
);
r = fd;
goto finish;
}
r = fd;
goto finish;
}
@@
-143,7
+143,7
@@
int main(int argc, char *argv[]) {
if (dup3(fd, STDOUT_FILENO, 0) < 0 ||
dup3(fd, STDERR_FILENO, 0) < 0) {
if (dup3(fd, STDOUT_FILENO, 0) < 0 ||
dup3(fd, STDERR_FILENO, 0) < 0) {
- log_error
(
"Failed to duplicate fd: %m");
+ log_error
_errno(errno,
"Failed to duplicate fd: %m");
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}
@@
-164,7
+164,7
@@
int main(int argc, char *argv[]) {
if (saved_stderr >= 0)
dup3(saved_stderr, STDERR_FILENO, 0);
if (saved_stderr >= 0)
dup3(saved_stderr, STDERR_FILENO, 0);
- log_error
("Failed to execute process: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to execute process: %m"
);
finish:
safe_close(fd);
finish:
safe_close(fd);