Changeset 132ab5d1 in mainline for uspace/lib/c/include/io/klog.h

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/include/io/klog.h (modified) (1 diff)

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

@@ -44 +44 @@
 #include <abi/log.h>
 
-extern size_t klog_write(log_level_t, const void *, size_t);
-extern int klog_read(void *, size_t);
+extern int klog_write(log_level_t, const void *, size_t);
+extern int klog_read(void *, size_t, size_t *);
 
 #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); \
-        if (_c >= 0) { \
-                _c = klog_write((lvl), _s, str_size(_s)); \
+        int _rc = ENOMEM; \
+        if (asprintf(&_s, fmt, ##__VA_ARGS__) >= 0) { \
+                _rc = klog_write((lvl), _s, str_size(_s)); \
                 free(_s); \
         }; \
-        (_c >= 0); \
+        (_rc != EOK); \
 })