mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Oleksij Rempel <o.rempel@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: [PATCH] common: console_common: do not store color additions to the log buffer
Date: Thu, 21 Feb 2019 14:55:48 +0100	[thread overview]
Message-ID: <20190221135548.22027-1-o.rempel@pengutronix.de> (raw)

it is needed for raw dmesg output

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 common/console_common.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/common/console_common.c b/common/console_common.c
index 4aa54de97a..a4d2636753 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -79,6 +79,18 @@ void log_clean(unsigned int limit)
 	}
 }
 
+static void print_colored_log_level(const int level)
+{
+	if (!console_allow_color())
+		return;
+	if (level >= ARRAY_SIZE(colored_log_level))
+		return;
+	if (!colored_log_level[level])
+		return;
+
+	puts(colored_log_level[level]);
+}
+
 static void pr_puts(int level, const char *str)
 {
 	struct log_entry *log;
@@ -108,21 +120,10 @@ nolog:
 	if (level > barebox_loglevel)
 		return;
 
+	print_colored_log_level(level);
 	puts(str);
 }
 
-static void print_colored_log_level(const int level)
-{
-	if (!console_allow_color())
-		return;
-	if (level >= ARRAY_SIZE(colored_log_level))
-		return;
-	if (!colored_log_level[level])
-		return;
-
-	pr_puts(level, colored_log_level[level]);
-}
-
 int pr_print(int level, const char *fmt, ...)
 {
 	va_list args;
@@ -132,8 +133,6 @@ int pr_print(int level, const char *fmt, ...)
 	if (!IS_ENABLED(CONFIG_LOGBUF) && level > barebox_loglevel)
 		return 0;
 
-	print_colored_log_level(level);
-
 	va_start(args, fmt);
 	i = vsprintf(printbuffer, fmt, args);
 	va_end(args);
@@ -152,8 +151,6 @@ int dev_printf(int level, const struct device_d *dev, const char *format, ...)
 	if (!IS_ENABLED(CONFIG_LOGBUF) && level > barebox_loglevel)
 		return 0;
 
-	print_colored_log_level(level);
-
 	if (dev->driver && dev->driver->name)
 		ret += sprintf(printbuffer, "%s ", dev->driver->name);
 
@@ -205,7 +202,11 @@ void log_print(unsigned flags, unsigned levels)
 		if (levels && !(levels & (1 << log->level)))
 			continue;
 
-		if (flags & (BAREBOX_LOG_PRINT_RAW))
+		if (!(flags & (BAREBOX_LOG_PRINT_RAW | BAREBOX_LOG_PRINT_TIME
+			       | BAREBOX_LOG_DIFF_TIME)))
+			print_colored_log_level(log->level);
+
+		if (flags & BAREBOX_LOG_PRINT_RAW)
 			printf("<%i>", log->level);
 
 		do_div(diff, 1000);
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2019-02-21 13:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-21 13:55 Oleksij Rempel [this message]
2019-02-25  8:10 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190221135548.22027-1-o.rempel@pengutronix.de \
    --to=o.rempel@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox