Implement a proper block layer with partition support.

[pintos-anon] / src / lib / stdio.h

diff --git a/src/lib/stdio.h b/src/lib/stdio.h
index 4609fb3be1e1cca30ebb13498c5c62cc78ae428e..2739c0a2959de450fc348554f1730c2a0decc22c 100644 (file)
--- a/src/lib/stdio.h
+++ b/src/lib/stdio.h
@@ -2,20 +2,30 @@
 #define __LIB_STDIO_H
 
 #include <debug.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdarg.h>
+#include <stdint.h>
+
+/* Include lib/user/stdio.h or lib/kernel/stdio.h, as
+   appropriate. */
+#include_next <stdio.h>
+
+/* Predefined file handles. */
+#define STDIN_FILENO 0
+#define STDOUT_FILENO 1
 
 /* Standard functions. */
-int vsnprintf (char *, size_t, const char *, va_list) PRINTF_FORMAT (3, 0);
+int printf (const char *, ...) PRINTF_FORMAT (1, 2);
 int snprintf (char *, size_t, const char *, ...) PRINTF_FORMAT (3, 4);
 int vprintf (const char *, va_list) PRINTF_FORMAT (1, 0);
-int printf (const char *, ...) PRINTF_FORMAT (1, 2);
+int vsnprintf (char *, size_t, const char *, va_list) PRINTF_FORMAT (3, 0);
 int putchar (int);
 int puts (const char *);
 
 /* Nonstandard functions. */
-void hex_dump (const void *, size_t size, bool ascii);
+void hex_dump (uintptr_t ofs, const void *, size_t size, bool ascii);
+void print_human_readable_size (uint64_t sz);
 
 /* Internal functions. */
 void __vprintf (const char *format, va_list args,