From be25d875b924cbd50d49fd9f343e70d86b7ad7e0 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 12 Nov 2014 18:26:50 -0700 Subject: [PATCH] Add pr_fmt() macro This macro can be overridden in source files (before including common.h) and can be used to specify a prefix for debug and error messages. An example of how to use this is shown below: #define pr_fmt(fmt) "foo: " fmt #include ... debug("bar"); The resulting message will read: foo: bar Acked-by: Simon Glass Signed-off-by: Thierry Reding Signed-off-by: Simon Glass --- include/common.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index ce0a7343f4..f1ab2cf5f4 100644 --- a/include/common.h +++ b/include/common.h @@ -97,15 +97,19 @@ typedef volatile unsigned char vu_char; #define _DEBUG 0 #endif +#ifndef pr_fmt +#define pr_fmt(fmt) fmt +#endif + /* * Output a debug text when condition "cond" is met. The "cond" should be * computed by a preprocessor in the best case, allowing for the best * optimization. */ -#define debug_cond(cond, fmt, args...) \ - do { \ - if (cond) \ - printf(fmt, ##args); \ +#define debug_cond(cond, fmt, args...) \ + do { \ + if (cond) \ + printf(pr_fmt(fmt), ##args); \ } while (0) #define debug(fmt, args...) \ @@ -127,7 +131,7 @@ void __assert_fail(const char *assertion, const char *file, unsigned line, __assert_fail(#x, __FILE__, __LINE__, __func__); }) #define error(fmt, args...) do { \ - printf("ERROR: " fmt "\nat %s:%d/%s()\n", \ + printf("ERROR: " pr_fmt(fmt) "\nat %s:%d/%s()\n", \ ##args, __FILE__, __LINE__, __func__); \ } while (0) -- 2.25.1