Changeset 4c6de4f in mainline

Timestamp:

2017-12-10T21:51:26Z (7 years ago)

Author:

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

Branches:

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

Children:

9b07fba

Parents:

68e5406

Message:

Remove unnecessary format string duplication from KLOG_PRINTF() macro.

Location:

uspace

Files:

• lib/c/include/io/klog.h (modified) (1 diff)
• srv/logger/writer.c (modified) (1 diff)

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

@@ -48 +48 @@
 
 #define KLOG_PRINTF(lvl, fmt, ...) ({ \
-        char *_fmt = str_dup(fmt); \
-        size_t _fmtsize = str_size(_fmt); \
-        if (_fmtsize > 0 && _fmt[_fmtsize - 1] == '\n') \
-                _fmt[_fmtsize - 1] = 0; \
         char *_s; \
-        int _c = asprintf(&_s, _fmt, ##__VA_ARGS__); \
-        free(_fmt); \
+        int _c = asprintf(&_s, fmt, ##__VA_ARGS__); \
         if (_c >= 0) { \
                 _c = klog_write((lvl), _s, str_size(_s)); \

uspace/srv/logger/writer.c

@@ -80 +80 @@
         }
 
-        KLOG_PRINTF(level, "[%s] %s: %s\n",
+        KLOG_PRINTF(level, "[%s] %s: %s",
             log->full_name, log_level_str(level),
             (const char *) message);