SQUASHME: move log level to log() call

RIOT-OS · Mar 4, 2015 · 4e24aa7 · 4e24aa7
1 parent d8a7588
commit 4e24aa7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/core/include/log.h b/core/include/log.h
@@ -44,23 +44,15 @@ enum {
  * @{
  */
 
-#define LOG(level, ...) if (level <= LOG_LEVEL) _log(level, __VA_ARGS__)
+#define log(level, ...) if (level <= LOG_LEVEL) _log(level, __VA_ARGS__)
 
 /** @} */
 
 #ifdef HAVE_LOG_MODULE
 #include "log_module.h"
 #else
-
 #include <stdio.h>
-
 #define _log(level, ...) printf(__VA_ARGS__)
-
-#define log_error(...) LOG(LOG_ERROR, __VA_ARGS__)
-#define log_warning(...) LOG(LOG_WARNING, __VA_ARGS__)
-#define log_info(...) LOG(LOG_INFO, __VA_ARGS__)
-#define log_debug(...) LOG(LOG_DEBUG, __VA_ARGS__)
-
 #endif
 
 #ifdef __cplusplus

diff --git a/core/kernel_init.c b/core/kernel_init.c
@@ -82,19 +82,19 @@ static char idle_stack[KERNEL_CONF_STACKSIZE_IDLE];
 void kernel_init(void)
 {
     (void) disableIRQ();
-    log_info("kernel_init(): This is RIOT! (Version: %s)\n", RIOT_VERSION);
+    log(LOG_INFO, "kernel_init(): This is RIOT! (Version: %s)\n", RIOT_VERSION);
 
     hwtimer_init();
 
     if (thread_create(idle_stack, sizeof(idle_stack), PRIORITY_IDLE, CREATE_WOUT_YIELD | CREATE_STACKTEST, idle_thread, NULL, idle_name) < 0) {
-        log_error("kernel_init(): error creating idle task.\n");
+        log(LOG_ERROR, "kernel_init(): error creating idle task.\n");
     }
 
     if (thread_create(main_stack, sizeof(main_stack), PRIORITY_MAIN, CREATE_WOUT_YIELD | CREATE_STACKTEST, main_trampoline, NULL, main_name) < 0) {
-        log_error("kernel_init(): error creating main task.\n");
+        log(LOG_ERROR, "kernel_init(): error creating main task.\n");
     }
 
-    log_info("kernel_init(): jumping into first task...\n");
+    log(LOG_INFO, "kernel_init(): jumping into first task...\n");
 
     cpu_switch_context_exit();
 }
diff --git a/sys/log/log_printfnoformat/log_module.h b/sys/log/log_printfnoformat/log_module.h
@@ -8,9 +8,4 @@ static void _log(unsigned level, const char *format, ...) {
     puts(format);
 }
 
-#define log_error(...) LOG(LOG_ERROR, "E: " __VA_ARGS__)
-#define log_warning(...) LOG(LOG_WARNING, "W: " __VA_ARGS__)
-#define log_info(...) LOG(LOG_INFO, "I: " __VA_ARGS__)
-#define log_debug(...) LOG(LOG_DEBUG, "D: " __VA_ARGS__)
-
 #endif /* __LOG_FORMAT_H */