[PATCH BlueZ v3 1/9] log: Don't log __FILE__ and __func__ with DBG_IDX

Luiz Augusto von Dentz
2022-03-23T20:13:50Z

This removes __FILE__ and __func__ from DBG_IDX since users of it may
already contain such information embedded in the format.
---
src/log.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/log.h b/src/log.h
index 74941beb2..a244fc4d8 100644
--- a/src/log.h
+++ b/src/log.h
@@ -9,6 +9,7 @@
*/

#include <stdint.h>
+#include <stdbool.h>

void info(const char *format, ...) __attribute__((format(printf, 1, 2)));

@@ -52,10 +53,11 @@ void __btd_enable_debug(struct btd_debug_desc *start,
.file = __FILE__, .flags = BTD_DEBUG_FLAG_DEFAULT, \
}; \
if (__btd_debug_desc.flags & BTD_DEBUG_FLAG_PRINT) \
- btd_debug(idx, "%s:%s() " fmt, __FILE__, __func__ , ## arg); \
+ btd_debug(idx, fmt, ## arg); \
} while (0)

-#define DBG(fmt, arg...) DBG_IDX(0xffff, fmt, ## arg)
+#define DBG(fmt, arg...) \
+ DBG_IDX(0xffff, "%s:%s() " fmt, __FILE__, __func__ , ## arg)
#define error(fmt, arg...) \
btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
#define warn(fmt, arg...) \
--
2.35.1