Changeset dc5c303 in mainline for kernel/generic/include/debug.h

Timestamp:

2023-12-28T13:59:23Z (6 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• kernel/generic/include/debug.h (modified) (3 diffs)

kernel/generic/include/debug.h

@@ -37 +37 @@
 
 #include <log.h>
-#include <symtab_lookup.h>
+#include <printf/verify.h>
 
 #define CALLER  ((uintptr_t) __builtin_return_address(0))
+
+/* An empty printf function to ensure syntactic correctness of disabled debug prints. */
+static inline void dummy_printf(const char *fmt, ...) _HELENOS_PRINTF_ATTRIBUTE(1, 2);
+static inline void dummy_printf(const char *fmt, ...)
+{
+}
 
 #ifdef CONFIG_LOG
@@ -53 +59 @@
         do { \
                 log(LF_OTHER, LVL_DEBUG, \
-                    "%s() from %s at %s:%u: " format,__func__, \
+                    "%s() from %s at %s:%u: " format, __func__, \
                     symtab_fmt_name_lookup(CALLER), __FILE__, __LINE__, \
                     ##__VA_ARGS__); \
@@ -60 +66 @@
 #else /* CONFIG_LOG */
 
-#define LOG(format, ...)
+#define LOG(format, ...) dummy_printf(format, ##__VA_ARGS__)
 
 #endif /* CONFIG_LOG */