[systemd-devel] [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and _MACHINE_ID

2013-04-12 Thread Mirco Tischler 
---
 src/journal/journald-server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 53e3830..be84323 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -538,7 +538,7 @@ static void dispatch_message_real(
 char pid[sizeof(_PID=) + DECIMAL_STR_MAX(ucred-pid)],
 uid[sizeof(_UID=) + DECIMAL_STR_MAX(ucred-uid)],
 gid[sizeof(_GID=) + DECIMAL_STR_MAX(ucred-gid)],
-source_time[sizeof(_SOURCE_REALTIME_TIMESTAMP= + 
DECIMAL_STR_MAX(usec_t))],
+source_time[sizeof(_SOURCE_REALTIME_TIMESTAMP=) + 
DECIMAL_STR_MAX(usec_t)],
 boot_id[sizeof(_BOOT_ID=) + 32] = _BOOT_ID=,
 machine_id[sizeof(_MACHINE_ID=) + 32] = _MACHINE_ID=;
 
@@ -699,7 +699,7 @@ static void dispatch_message_real(
 
 r = sd_id128_get_machine(id);
 if (r = 0) {
-sd_id128_to_string(id, machine_id + sizeof(_MACHINE_ID) - 1);
+sd_id128_to_string(id, machine_id + sizeof(_MACHINE_ID=) - 
1);
 IOVEC_SET_STRING(iovec[n++], machine_id);
 }
 
-- 
1.8.2.1

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Re: [systemd-devel] [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and _MACHINE_ID

2013-04-12 Thread Zbigniew Jędrzejewski-Szmek 
On Sat, Apr 13, 2013 at 01:03:49AM +0200, Mirco Tischler wrote:
 ---
  src/journal/journald-server.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Applied!

Zbyszek

 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
 index 53e3830..be84323 100644
 --- a/src/journal/journald-server.c
 +++ b/src/journal/journald-server.c
 @@ -538,7 +538,7 @@ static void dispatch_message_real(
  char pid[sizeof(_PID=) + DECIMAL_STR_MAX(ucred-pid)],
  uid[sizeof(_UID=) + DECIMAL_STR_MAX(ucred-uid)],
  gid[sizeof(_GID=) + DECIMAL_STR_MAX(ucred-gid)],
 -source_time[sizeof(_SOURCE_REALTIME_TIMESTAMP= + 
 DECIMAL_STR_MAX(usec_t))],
 +source_time[sizeof(_SOURCE_REALTIME_TIMESTAMP=) + 
 DECIMAL_STR_MAX(usec_t)],
  boot_id[sizeof(_BOOT_ID=) + 32] = _BOOT_ID=,
  machine_id[sizeof(_MACHINE_ID=) + 32] = _MACHINE_ID=;
  
 @@ -699,7 +699,7 @@ static void dispatch_message_real(
  
  r = sd_id128_get_machine(id);
  if (r = 0) {
 -sd_id128_to_string(id, machine_id + sizeof(_MACHINE_ID) - 
 1);
 +sd_id128_to_string(id, machine_id + sizeof(_MACHINE_ID=) - 
 1);
  IOVEC_SET_STRING(iovec[n++], machine_id);
  }
  
 -- 
 1.8.2.1
 
 ___
 systemd-devel mailing list
 systemd-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/systemd-devel
 
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel