Changeset a1a101d in mainline for uspace/lib

Timestamp:

2012-08-17T16:58:51Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc0ccab

Parents:

920d0fc

Message:

Get rid of log_log_msg()

All calls to log_msg(LVL_*) were rewritten to
log_msg(LOG_DEFAULT, LVL_*).

Location:

uspace/lib

Files:

• c/generic/io/log.c (modified) (2 diffs)
• c/include/io/log.h (modified) (1 diff)
• drv/generic/log.c (modified) (1 diff)
• usb/include/usb/debug.h (modified) (1 diff)

uspace/lib/c/generic/io/log.c

@@ -192 +192 @@
  * @param fmt           Format string (no traling newline).
  */
-void log_log_msg(log_t ctx, log_level_t level, const char *fmt, ...)
+void log_msg(log_t ctx, log_level_t level, const char *fmt, ...)
 {
         va_list args;
 
         va_start(args, fmt);
-        log_log_msgv(ctx, level, fmt, args);
+        log_msgv(ctx, level, fmt, args);
         va_end(args);
 }
@@ -208 +208 @@
  * @param fmt           Format string (no trailing newline)
  */
-void log_log_msgv(log_t ctx, log_level_t level, const char *fmt, va_list args)
+void log_msgv(log_t ctx, log_level_t level, const char *fmt, va_list args)
 {
         assert(level < LVL_LIMIT);

uspace/lib/c/include/io/log.h

@@ -62 +62 @@
 extern log_t log_create(const char *, log_t);
 
-#define log_msg(level, format, ...) \
-        log_log_msg(LOG_DEFAULT, (level), (format), ##__VA_ARGS__)
-#define log_msgv(level, format, args) \
-        log_log_msgv(LOG_DEFAULT, (level), (format), (args))
-
-extern void log_log_msg(log_t, log_level_t, const char *, ...);
-extern void log_log_msgv(log_t, log_level_t, const char *, va_list);
+extern void log_msg(log_t, log_level_t, const char *, ...);
+extern void log_msgv(log_t, log_level_t, const char *, va_list);
 
 #endif

uspace/lib/drv/generic/log.c

@@ -58 +58 @@
         
         va_start(args, fmt);
-        log_msgv(level, fmt, args);
+        log_msgv(LOG_DEFAULT, level, fmt, args);
         va_end(args);
 }

uspace/lib/usb/include/usb/debug.h

@@ -59 +59 @@
 
 #define usb_log_printf(level, format, ...) \
-        log_msg(level, format, ##__VA_ARGS__)
+        log_msg(LOG_DEFAULT, level, format, ##__VA_ARGS__)
 
 /** Log fatal error. */