x86: vmm: Rework VMRESUME logic

[akaros.git] / kern / include / stdio.h

diff --git a/kern/include/stdio.h b/kern/include/stdio.h
index e25ead5..aa880e6 100644 (file)
--- a/kern/include/stdio.h
+++ b/kern/include/stdio.h
@@ -1,5 +1,4 @@
-#ifndef ROS_INC_STDIO_H
-#define ROS_INC_STDIO_H
+#pragma once
 
 #include <ros/common.h>
 #include <stdarg.h>
@@ -22,33 +21,41 @@
 
 // lib/stdio.c
 void   cputchar(int c);
-void   cputbuf(const char*COUNT(len) buf, int len);
+void   cputbuf(const char *buf, int len);
 int    getchar(void);
 int    iscons(int fd);
 
 // lib/printfmt.c
-#ifdef __DEPUTY__
-void   printfmt(void (*putch)(int, TV(t)), TV(t) putdat, const char *NTS fmt, ...);
-void   vprintfmt(void (*putch)(int, TV(t)), TV(t) putdat, const char *NTS fmt, va_list);
-#else
-void   printfmt(void (*putch)(int, void**), void **putdat, const char *NTS fmt, ...);
-void   vprintfmt(void (*putch)(int, void**), void **putdat, const char *NTS fmt, va_list);
-#endif
+void   printfmt(void (*putch)(int, void**), void **putdat, const char *fmt, ...);
+void   vprintfmt(void (*putch)(int, void**), void **putdat, const char *fmt, va_list);
 
 // lib/printf.c
-int    ( cprintf)(const char * NTS fmt, ...);
-int    vcprintf(const char * NTS fmt, va_list);
+int    ( cprintf)(const char *fmt, ...);
+int    vcprintf(const char *fmt, va_list);
 
 // lib/sprintf.c
-int    snprintf(char *COUNT(size) str, int size, const char *NTS fmt, ...);
-int    vsnprintf(char *COUNT(size) str, int size, const char *NTS fmt, va_list);
+int    snprintf(char *str, int size, const char *fmt, ...);
+int    vsnprintf(char *str, int size, const char *fmt, va_list);
 
 // lib/fprintf.c
-int    printf(const char *NTS fmt, ...);
-int    fprintf(int fd, const char *NTS fmt, ...);
-int    vfprintf(int fd, const char *NTS fmt, va_list);
+int    printf(const char *fmt, ...);
+int    fprintf(int fd, const char *fmt, ...);
+int    vfprintf(int fd, const char *fmt, va_list);
 
 // lib/readline.c
 int readline(char *buf, size_t buf_l, const char *prompt, ...);
 
-#endif /* !ROS_INC_STDIO_H */
+char *seprintf(char *buf, char *end, const char *fmt, ...);
+
+// kern/src/net/eipconv.c
+void printemac(void (*putch)(int, void**), void **putdat, uint8_t *mac);
+void printip(void (*putch)(int, void**), void **putdat, uint8_t *ip);
+void printipmask(void (*putch)(int, void**), void **putdat, uint8_t *ip);
+void printipv4(void (*putch)(int, void**), void **putdat, uint8_t *ip);
+
+/* #K */
+void trace_printk(const char *fmt, ...);
+
+/* vsprintf.c (linux) */
+int vsscanf(const char *buf, const char *fmt, va_list args);
+int sscanf(const char *buf, const char *fmt, ...);