Changeset d28bdbe in mainline

Timestamp:

2023-10-26T11:58:44Z (13 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

da13982

Parents:

95fc538

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-26 11:50:41)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-26 11:58:44)

Message:

Verify arguments of empty log calls

Location:

kernel/generic

Files:

• include/debug.h (modified) (3 diffs)
• src/main/main.c (modified) (1 diff)

kernel/generic/include/debug.h

@@ -38 +38 @@
 #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. */
+_HELENOS_PRINTF_ATTRIBUTE(1, 2)
+static inline void dummy_printf(const char *fmt, ...)
+{
+}
 
 #ifdef CONFIG_LOG
@@ -53 +60 @@
         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 +67 @@
 #else /* CONFIG_LOG */
 
-#define LOG(format, ...)
+#define LOG(format, ...) dummy_printf(format, ##__VA_ARGS__)
 
 #endif /* CONFIG_LOG */

kernel/generic/src/main/main.c

@@ -193 +193 @@
         version_print();
 
-        LOG("\nconfig.base=%p config.kernel_size=%zu"
-            "\nconfig.stack_base=%p config.stack_size=%zu",
-            (void *) config.base, config.kernel_size,
-            (void *) config.stack_base, config.stack_size);
+        LOG("\nconfig.base=%p config.kernel_size=%zu",
+            (void *) config.base, config.kernel_size);
 
 #ifdef CONFIG_KCONSOLE