aboutsummaryrefslogtreecommitdiff
path: root/lib/libk/stdio
diff options
context:
space:
mode:
authoraqua <aqua@iserlohn-fortress.net>2023-03-12 18:39:39 +0200
committeraqua <aqua@iserlohn-fortress.net>2023-03-12 18:39:39 +0200
commitfbc736463f2ca2f5dbf1b7c412f408245e61df97 (patch)
tree84a66eabc5e3be2191ae0d5d1e0ff33d05515b4a /lib/libk/stdio
parentAdd unit tests for C drivers (diff)
downloadkernel-fbc736463f2ca2f5dbf1b7c412f408245e61df97.tar.xz
Revert VGA C driver
Diffstat (limited to 'lib/libk/stdio')
-rw-r--r--lib/libk/stdio/vfprintf.c (renamed from lib/libk/stdio/vfprintf.cpp)18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/libk/stdio/vfprintf.cpp b/lib/libk/stdio/vfprintf.c
index aa9256d..d24e43e 100644
--- a/lib/libk/stdio/vfprintf.cpp
+++ b/lib/libk/stdio/vfprintf.c
@@ -3,7 +3,7 @@
static char buffer[3 * sizeof(int) + 2];
-extern "C" int
+int
vfprintf(FILE *restrict stream, const char *restrict format, va_list params)
{
int written = 0;
@@ -12,31 +12,31 @@ vfprintf(FILE *restrict stream, const char *restrict format, va_list params)
int l = 0;
for (int 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);
+ 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 +47,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;
}