Finally move the prototypes for printf() and friends to stdio.h

2 files changed, 41 insertions, 34 deletions

diff --git a/src/include/stdio.h b/src/include/stdio.h
new file mode 100644
index 000000000..169cfd9e3
--- /dev/null
+++ b/src/include/stdio.h
@@ -0,0 +1,40 @@
+#ifndef _STDIO_H
+#define _STDIO_H
+
+#include <stdint.h>
+#include <stdarg.h>
+
+extern int __attribute__ (( format ( printf, 1, 2 ) ))
+printf ( const char *fmt, ... );
+
+extern int __attribute__ (( format ( printf, 3, 4 ) ))
+snprintf ( char *buf, size_t size, const char *fmt, ... );
+
+extern int vprintf ( const char *fmt, va_list args );
+
+extern int vsnprintf ( char *buf, size_t size, const char *fmt, va_list args );
+
+/**
+ * Write a formatted string to a buffer
+ *
+ * @v buf		Buffer into which to write the string
+ * @v fmt		Format string
+ * @v ...		Arguments corresponding to the format string
+ * @ret len		Length of formatted string
+ */
+#define sprintf( buf, fmt, ... ) \
+	snprintf ( (buf), ~( ( size_t ) 0 ), (fmt), ## __VA_ARGS__ )
+
+/**
+ * Write a formatted string to a buffer
+ *
+ * @v buf		Buffer into which to write the string
+ * @v fmt		Format string
+ * @v args		Arguments corresponding to the format string
+ * @ret len		Length of formatted string
+ */
+static inline int vsprintf ( char *buf, const char *fmt, va_list args ) {
+	return vsnprintf ( buf, ~( ( size_t ) 0 ), fmt, args );
+}
+
+#endif /* _STDIO_H */
diff --git a/src/include/vsprintf.h b/src/include/vsprintf.h
index bba9b9df7..313605bb4 100644
--- a/src/include/vsprintf.h
+++ b/src/include/vsprintf.h
@@ -33,8 +33,7 @@
 
 #include <stdint.h>
 #include <stdarg.h>
-
-#define PRINTF_NO_LENGTH ( ( size_t ) -1 )
+#include <stdio.h>
 
 /**
  * A printf context
@@ -65,36 +64,4 @@ struct printf_context {
 
 extern size_t vcprintf ( struct printf_context *ctx, const char *fmt,
 			 va_list args );
-extern int vsnprintf ( char *buf, size_t size, const char *fmt, va_list args );
-extern int vprintf ( const char *fmt, va_list args );
-
-extern int __attribute__ (( format ( printf, 3, 4 ) ))
-snprintf ( char *buf, size_t size, const char *fmt, ... );
-
-extern int __attribute__ (( format ( printf, 1, 2 ) ))
-printf ( const char *fmt, ... );
-
-/**
- * Write a formatted string to a buffer
- *
- * @v buf		Buffer into which to write the string
- * @v fmt		Format string
- * @v ...		Arguments corresponding to the format string
- * @ret len		Length of formatted string
- */
-#define sprintf( buf, fmt, ... ) \
-	snprintf ( (buf), PRINTF_NO_LENGTH, (fmt), ## __VA_ARGS__ )
-
-/**
- * Write a formatted string to a buffer
- *
- * @v buf		Buffer into which to write the string
- * @v fmt		Format string
- * @v args		Arguments corresponding to the format string
- * @ret len		Length of formatted string
- */
-static inline int vsprintf ( char *buf, const char *fmt, va_list args ) {
-	return vsnprintf ( buf, PRINTF_NO_LENGTH, fmt, args );
-}
-
 #endif /* VSPRINTF_H */