Changeset 5572ad1 in mainline for uspace/lib/c

Timestamp:

2012-08-23T21:50:46Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

276e44a

Parents:

ae827d0 (diff), db81577 (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 mainline changes

Location:

uspace/lib/c/include

Files:

• io/klog.h (modified) (1 diff)
• io/log.h (modified) (3 diffs)
• io/verify.h (added)
• stdio.h (modified) (1 diff)

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

@@ -38 +38 @@
 #include <sys/types.h>
 #include <stdarg.h>
+#include <io/verify.h>
 
 extern size_t klog_write(const void *, size_t);
 extern void klog_update(void);
-extern int klog_printf(const char *, ...);
+extern int klog_printf(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
 extern int klog_vprintf(const char *, va_list);
 

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

@@ -36 +36 @@
 
 #include <stdarg.h>
+#include <io/verify.h>
 
 typedef enum {
@@ -44 +45 @@
         LVL_DEBUG,
         LVL_DEBUG2,
-
+        
         /** For checking range of values */
         LVL_LIMIT
@@ -50 +51 @@
 
 extern int log_init(const char *, log_level_t);
-extern void log_msg(log_level_t, const char *, ...);
+extern void log_msg(log_level_t, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern void log_msgv(log_level_t, const char *, va_list);
 

uspace/lib/c/include/stdio.h

@@ -39 +39 @@
 #include <stdarg.h>
 #include <str.h>
-
-#ifndef NVERIFY_PRINTF
-
-#define PRINTF_ATTRIBUTE(start, end) \
-        __attribute__((format(gnu_printf, start, end)))
-
-#else /* NVERIFY_PRINTF */
-
-#define PRINTF_ATTRIBUTE(start, end)
-
-#endif /* NVERIFY_PRINTF */
+#include <io/verify.h>
 
 #define EOF  (-1)