3 files changed, 19 insertions, 16 deletions
diff --git a/lib/libk/stdio/fprintf.c b/lib/libk/stdio/fprintf.c
index 9a96dc6..c088f54 100644
--- a/lib/libk/stdio/fprintf.c
+++ b/lib/libk/stdio/fprintf.c
@@ -1,11 +1,12 @@
 #include <stdio.h>
 
 int
-fprintf(FILE *restrict stream, const char *restrict format, ...)
+fprintf(FILE *__restrict__ stream, const char *__restrict__ format, ...)
 {
+  int c = 0;
   va_list ap;
   va_start(ap, format);
-  int c = vfprintf(stream, format, ap);
+  c += vfprintf(stream, format, ap);
   va_end(ap);
   return c;
 }
diff --git a/lib/libk/stdio/printf.c b/lib/libk/stdio/printf.c
index 4efc1ac..4c45593 100644
--- a/lib/libk/stdio/printf.c
+++ b/lib/libk/stdio/printf.c
@@ -1,11 +1,12 @@
 #include <stdio.h>
 
 int
-printf(const char *restrict format, ...)
+printf(const char *__restrict__ format, ...)
 {
+  int c = 0;
   va_list ap;
   va_start(ap, format);
-  int c = vfprintf(stdout, format, ap);
+  c += vfprintf(stdout, format, ap);
   va_end(ap);
   return c;
 }
diff --git a/lib/libk/stdio/vfprintf.cpp b/lib/libk/stdio/vfprintf.c
index aa9256d..807c26a 100644
--- a/lib/libk/stdio/vfprintf.cpp
+++ b/lib/libk/stdio/vfprintf.c
@@ -3,40 +3,41 @@
 
 static char buffer[3 * sizeof(int) + 2];
 
-extern "C" int
-vfprintf(FILE *restrict stream, const char *restrict format, va_list params)
+int
+vfprintf(FILE *__restrict__ stream, const char *__restrict__ format, va_list params)
 {
   int written = 0;
 
+  int i;
   int s = 0;
   int l = 0;
-  for (int i = 0; format[i] != '\0'; ++i) {
+  for (i = 0; format[i] != '\0'; ++i) {
     if (format[i] == '%') {
-      written += stream->puts(&format[s], l);
+      written += stream->puts(stream, &format[s], l);
       s = i + 2;
       ++i;
 
       switch (format[i]) {
       case 's': {
         const char *arg = va_arg(params, const char *);
-        written += stream->puts(arg, -1);
+        written += stream->puts(stream, arg, -1);
       } break;
       case 'c': {
-        const int arg = va_arg(params, int);
-        stream->putc(arg);
+        const char arg = (char)va_arg(params, int);
+        stream->putc(stream, arg);
         ++written;
       } break;
       case 'd': {
         const char *arg = itoa(buffer, va_arg(params, int), 10);
-        written += stream->puts(arg, -1);
+        written += stream->puts(stream, arg, -1);
       } break;
       case 'u': {
         const char *arg = utoa(buffer, va_arg(params, unsigned int), 10);
-        written += stream->puts(arg, -1);
+        written += stream->puts(stream, arg, -1);
       } break;
       case 'x': {
         const char *arg = utoa(buffer, va_arg(params, unsigned int), 16);
-        written += stream->puts(arg, -1);
+        written += stream->puts(stream, arg, -1);
       } break;
       }
 
@@ -47,8 +48,8 @@ vfprintf(FILE *restrict stream, const char *restrict format, va_list params)
       ++l;
   }
 
-  if (l > 0) { written += stream->puts(&format[s], l); }
+  if (l > 0) { written += stream->puts(stream, &format[s], l); }
 
-  stream->flush();
+  stream->flush(stream);
   return written;
 }