chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
architecture: add string table entries for mips-le archs which were missing
[elogind.git]
/
src
/
journal
/
journald-console.c
diff --git
a/src/journal/journald-console.c
b/src/journal/journald-console.c
index 35da52af2afa7a663ba24ee1074339f334ff55d2..6ec2528d7423bab74f236b0b5902a5cb5d1a27d7 100644
(file)
--- a/
src/journal/journald-console.c
+++ b/
src/journal/journald-console.c
@@
-67,9
+67,9
@@
void server_forward_console(
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
- snprintf(tbuf, sizeof(tbuf), "[%5
llu.%06llu
] ",
-
(unsigned long long)
ts.tv_sec,
-
(unsigned long long)
ts.tv_nsec / 1000);
+ snprintf(tbuf, sizeof(tbuf), "[%5
"PRI_TIME".%06ld
] ",
+ ts.tv_sec,
+ ts.tv_nsec / 1000);
IOVEC_SET_STRING(iovec[n++], tbuf);
}
IOVEC_SET_STRING(iovec[n++], tbuf);
}
@@
-80,7
+80,7
@@
void server_forward_console(
identifier = ident_buf;
}
identifier = ident_buf;
}
- snprintf(header_pid, sizeof(header_pid), "[
%lu]: ", (unsigned long)
ucred->pid);
+ snprintf(header_pid, sizeof(header_pid), "[
"PID_FMT"]: ",
ucred->pid);
char_array_0(header_pid);
if (identifier)
char_array_0(header_pid);
if (identifier)
@@
-107,5
+107,5
@@
void server_forward_console(
if (writev(fd, iovec, n) < 0)
log_debug("Failed to write to %s for logging: %m", tty);
if (writev(fd, iovec, n) < 0)
log_debug("Failed to write to %s for logging: %m", tty);
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
}
}