X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-console.c;h=4afa6ef9c3bb410741d79d0a6f4d12bc107de05d;hb=fc07d5d3a982e59d984d6be54342a18028faf7be;hp=3db5fc50a17cb03998b5243ab0f0d532c27f70bd;hpb=03e334a1c7dc8c20c38902aa039440763acc9b17;p=elogind.git

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 3db5fc50a..4afa6ef9c 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -48,7 +48,7 @@ void server_forward_console(
                 int priority,
                 const char *identifier,
                 const char *message,
-                struct ucred *ucred) {
+                const struct ucred *ucred) {
 
         struct iovec iovec[5];
         char header_pid[16];
@@ -67,9 +67,9 @@ void server_forward_console(
         /* First: timestamp */
         if (prefix_timestamp()) {
                 assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
-                snprintf(tbuf, sizeof(tbuf), "[%5llu.%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);
         }
 
@@ -80,7 +80,7 @@ void server_forward_console(
                         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)
@@ -100,12 +100,12 @@ void server_forward_console(
 
         fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC);
         if (fd < 0) {
-                log_debug("Failed to open %s for logging: %m", tty);
+                log_debug_errno(errno, "Failed to open %s for logging: %m", tty);
                 return;
         }
 
         if (writev(fd, iovec, n) < 0)
-                log_debug("Failed to write to %s for logging: %m", tty);
+                log_debug_errno(errno, "Failed to write to %s for logging: %m", tty);
 
         safe_close(fd);
 }