From 172da6cf07534e81acc14e496ec026b1e8e349e7 Mon Sep 17 00:00:00 2001 From: Francesco Date: Mon, 26 Jan 2026 15:21:39 +0100 Subject: [PATCH] refactor(io): change functions names --- include/io.h | 3 +-- src/io.c | 37 ++++++++++++------------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/include/io.h b/include/io.h index bc2c631..8df2a2c 100644 --- a/include/io.h +++ b/include/io.h @@ -8,7 +8,6 @@ #define va_end __builtin_va_end #define va_arg __builtin_va_arg -void r_printf(const char *fmt, ...); -size_t r_strlen(const char *str); +void kprintf(const char *fmt, ...); #endif diff --git a/src/io.c b/src/io.c index 3a9bcb7..4c44fe1 100644 --- a/src/io.c +++ b/src/io.c @@ -1,14 +1,15 @@ #include "../include/io.h" +#include "../include/string.h" -void k_putchar(char ch); +void kputchar(char ch); -void r_printf(const char *fmt, ...) { +void kprintf(const char *fmt, ...) { va_list args; va_start(args, fmt); while (*fmt) { if (*fmt != '%') { - k_putchar(*fmt); + kputchar(*fmt); fmt++; continue; } @@ -18,13 +19,13 @@ void r_printf(const char *fmt, ...) { switch (*fmt) { case '\0': { /* Simply print the char */ - k_putchar('%'); + kputchar('%'); goto end; } case '%': { /* Print '%' */ - k_putchar('%'); + kputchar('%'); break; } @@ -32,7 +33,7 @@ void r_printf(const char *fmt, ...) { /* Print a NULL-terminated string */ const char *s = va_arg(args, const char *); while (*s) { - k_putchar(*s); + kputchar(*s); s++; } @@ -43,7 +44,7 @@ void r_printf(const char *fmt, ...) { int value = va_arg(args, int); unsigned magnitude = value; if (value < 0) { - k_putchar('-'); + kputchar('-'); magnitude = -magnitude; } @@ -53,12 +54,9 @@ void r_printf(const char *fmt, ...) { } while (divisor > 0) { - k_putchar('0' + magnitude); - k_putchar('0' + magnitude / divisor); + kputchar('0' + magnitude / divisor); magnitude %= divisor; - k_putchar('0' + magnitude); divisor /= 10; - k_putchar('0' + magnitude); } break; @@ -69,14 +67,14 @@ void r_printf(const char *fmt, ...) { for (int i = 7; i >= 0; --i) { unsigned nibble = (value >> (i * 4)) & 0xF; /* From a char array we get the nibble position */ - k_putchar("0123456789ABCDEF"[nibble]); + kputchar("0123456789ABCDEF"[nibble]); } } default: { const char *str = "NOT IMPLEMENTED"; - size_t len = r_strlen(str); + size_t len = kstrlen(str); for (size_t i = 0; i < len; ++i) { - k_putchar(str[i]); + kputchar(str[i]); } } } @@ -87,14 +85,3 @@ void r_printf(const char *fmt, ...) { end: va_end(args); } - -size_t r_strlen(const char *str) { - size_t len = 0; - - while (*str) { - len++; - str++; - } - - return len; -}