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 cf6c49e3ef7841360f6856b2ecb009c88d7bb1e0..2739c0a2959de450fc348554f1730c2a0decc22c 100644 (file)
--- a/src/lib/stdio.h
+++ b/src/lib/stdio.h
@@ -2,9 +2,14 @@
 #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
@@ -19,14 +24,8 @@ int putchar (int);
 int puts (const char *);
 
 /* Nonstandard functions. */
-#ifdef KERNEL
-void putbuf (const char *, size_t);
-#endif
-#ifdef USER
-int hprintf (int, const char *, ...) PRINTF_FORMAT (2, 3);
-int vhprintf (int, const char *, va_list) PRINTF_FORMAT (2, 0);
-#endif
-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,