Changeset 09d13c8e in mainline for kernel/generic

Timestamp:

2018-01-13T14:57:38Z (8 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:

bd76871

Parents:

18bb198

Message:

Prefix PRINTF_ATTRIBUTE and NVERIFY_PRINTF macros with _HELENOS_ prefix,
because they are used in standard headers.

Location:

kernel/generic/include

Files:

• interrupt.h (modified) (1 diff)
• log.h (modified) (1 diff)
• panic.h (modified) (1 diff)
• print.h (modified) (1 diff)
• printf/verify.h (modified) (1 diff)

kernel/generic/include/interrupt.h

@@ -61 +61 @@
 
 extern void fault_from_uspace(istate_t *, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern void fault_if_from_uspace(istate_t *, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern istate_t *istate_get(thread_t *);
 extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);

kernel/generic/include/log.h

@@ -48 +48 @@
 extern int log_vprintf(const char *, va_list);
 extern int log_printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int log(log_facility_t, log_level_t, const char *, ...)
-    PRINTF_ATTRIBUTE(3, 4);
+    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 
 extern sys_errno_t sys_klog(sysarg_t, void *buf, size_t size,

kernel/generic/include/panic.h

@@ -66 +66 @@
 extern void panic_common(panic_category_t, struct istate *, int,
     uintptr_t, const char *, ...) __attribute__ ((noreturn))
-    PRINTF_ATTRIBUTE(5, 6);
+    _HELENOS_PRINTF_ATTRIBUTE(5, 6);
 
 #endif

kernel/generic/include/print.h

@@ -44 +44 @@
 extern int puts(const char *s);
 extern int printf(const char *fmt, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int snprintf(char *str, size_t size, const char *fmt, ...)
-    PRINTF_ATTRIBUTE(3, 4);
+    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 
 extern int vprintf(const char *fmt, va_list ap);

kernel/generic/include/printf/verify.h

@@ -36 +36 @@
 #define KERN_PRINTF_VERIFY_H_
 
-#ifndef NVERIFY_PRINTF
+#ifndef _HELENOS_NVERIFY_PRINTF
 
 #ifdef __clang__
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
         __attribute__((format(__printf__, start, end)))
 #else
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
         __attribute__((format(gnu_printf, start, end)))
 #endif
 
 
-#else /* NVERIFY_PRINTF */
+#else /* _HELENOS_NVERIFY_PRINTF */
 
-#define PRINTF_ATTRIBUTE(start, end)
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
 
-#endif /* NVERIFY_PRINTF */
+#endif /* _HELENOS_NVERIFY_PRINTF */
 
 #endif