Changeset 04803bf in mainline for boot/generic/include/printf.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• boot/generic/include/printf.h (moved) (moved from boot/generic/string.h ) (1 diff)

boot/generic/include/printf.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
- * @{
- */
 /** @file
  */
 
-#ifndef BOOT_STRING_H_
-#define BOOT_STRING_H_
+#ifndef BOOT_PRINT_H_
+#define BOOT_PRINT_H_
 
-#include <types.h>
+#include <typedefs.h>
+#include <stdarg.h>
 
-extern size_t strlen(const char *str);
-extern int strcmp(const char *src, const char *dst);
-extern int strncmp(const char *src, const char *dst, size_t len);
-extern void strncpy(char *dest, const char *src, size_t len);
-extern unative_t atoi(const char *text);
-extern void *memmove(void *dst, const void *src, size_t len);
+#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 */
+
+#define EOF  (-1)
+
+extern int puts(const char *);
+extern int printf(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
+extern int vprintf(const char *, va_list);
 
 #endif