Changeset 19b3cc6 in mainline for uspace/lib/c/include/io/klog.h

Timestamp:

2014-01-17T23:12:10Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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 libdrv-cleanup branch (includes mainline changes)

File:

• uspace/lib/c/include/io/klog.h (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Vana
+ * Copyright (c) 2013 Martin Sucha
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <stdarg.h>
 #include <io/verify.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <str.h>
+#include <abi/log.h>
 
-extern size_t klog_write(const void *, size_t);
-extern void klog_update(void);
-extern void klog_command(const void *, size_t);
-extern int klog_printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
-extern int klog_vprintf(const char *, va_list);
+extern size_t klog_write(log_level_t, const void *, size_t);
+extern int klog_read(void *, 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)); \
+                free(_s); \
+        }; \
+        (_c >= 0); \
+})
 
 #endif