chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-util: be more careful when invoking btrfs file system ioctls
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index 7a7a1e934f2ba9135f22f255153e878037d20ccd..54179e94c9e5d00611c99858a63808868f957fc5 100644
(file)
--- a/
src/shared/logs-show.c
+++ b/
src/shared/logs-show.c
@@
-33,6
+33,7
@@
#include "journal-internal.h"
#include "formats-util.h"
#include "process-util.h"
#include "journal-internal.h"
#include "formats-util.h"
#include "process-util.h"
+#include "terminal-util.h"
/* up to three lines (each up to 100 characters),
or 300 characters, whichever is less */
/* up to three lines (each up to 100 characters),
or 300 characters, whichever is less */
@@
-408,8
+409,8
@@
static int output_verbose(
if (r == -ENOENT)
log_debug("Source realtime timestamp not found");
else if (r < 0) {
if (r == -ENOENT)
log_debug("Source realtime timestamp not found");
else if (r < 0) {
- log_full
(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_ERR
,
-
"Failed to get source realtime timestamp: %s", strerror(-r)
);
+ log_full
_errno(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_ERR, r
,
+
"Failed to get source realtime timestamp: %m"
);
return r;
} else {
_cleanup_free_ char *value = NULL;
return r;
} else {
_cleanup_free_ char *value = NULL;
@@
-428,8
+429,8
@@
static int output_verbose(
if (r < 0) {
r = sd_journal_get_realtime_usec(j, &realtime);
if (r < 0) {
if (r < 0) {
r = sd_journal_get_realtime_usec(j, &realtime);
if (r < 0) {
- log_full
(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_ERR
,
-
"Failed to get realtime timestamp: %s", strerror(-r)
);
+ log_full
_errno(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_ERR, r
,
+
"Failed to get realtime timestamp: %m"
);
return r;
}
}
return r;
}
}