From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Mar 2019 17:11:35 +0000 (+0100)
Subject: json: log about the right line number
X-Git-Tag: v242-rc1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a16a2bb3170c5ee4427b6a437ab01ac8c0201f;p=thirdparty%2Fsystemd.git

json: log about the right line number

We mean the line number in the json data, not the line number in our
C source code.

Addresses: https://github.com/systemd/systemd/pull/9762#issuecomment-441183987
---

diff --git a/src/shared/json.c b/src/shared/json.c
index f46ea682042..2a858d4cc4f 100644
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -3164,7 +3164,7 @@ int json_log_internal(
                                 "CONFIG_FILE=%s", source,
                                 "CONFIG_LINE=%u", source_line,
                                 "CONFIG_COLUMN=%u", source_column,
-                                LOG_MESSAGE("%s:%u: %s", source, line, buffer),
+                                LOG_MESSAGE("%s:%u:%u: %s", source, source_line, source_column, buffer),
                                 NULL);
         else
                 return log_struct_internal(