From f495cc1e93710c233292a503720ec235a61b685c Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 18 Mar 2020 17:32:50 +0100 Subject: Applied official linux kernel code style guidelines Due to my change to vim and the clang-format plugin this was needed! --- src/kernel/lib/stdio/debug.c | 93 +++++++++++++++++++++-------------------- src/kernel/lib/stdio/getch.c | 10 ++--- src/kernel/lib/stdio/printf.c | 8 ++-- src/kernel/lib/stdio/readline.c | 7 ++-- src/kernel/lib/stdio/vprintf.c | 73 ++++++++++++++++---------------- src/kernel/lib/stdio/writec.c | 2 +- 6 files changed, 98 insertions(+), 95 deletions(-) (limited to 'src/kernel/lib/stdio') diff --git a/src/kernel/lib/stdio/debug.c b/src/kernel/lib/stdio/debug.c index cd042f4..b5e5094 100644 --- a/src/kernel/lib/stdio/debug.c +++ b/src/kernel/lib/stdio/debug.c @@ -7,54 +7,55 @@ void _write_serial(const char *data) { - for (size_t i = 0; i < strlen(data); i++) serial_put(data[i]); + for (size_t i = 0; i < strlen(data); i++) + serial_put(data[i]); } void serial_printf(const char *fmt, ...) { - va_list args; - va_start(args, fmt); - - uint8_t readyToFormat = 0; - - char buff = 0; - - for (; *fmt; fmt++) { - if (readyToFormat) { - if (*fmt == '%') { - serial_put('%'); - readyToFormat = 0; - continue; - } - - buff = *fmt; - if (buff == 's') { - const char *str = va_arg(args, const char*); - _write_serial(str); - readyToFormat = 0; - } else if (buff == 'x') { - char *p = htoa((uint32_t) va_arg(args, int)); - _write_serial(p); - kfree(p); - readyToFormat = 0; - } else if (buff == 'd') { - char *p = itoa(va_arg(args, int)); - _write_serial(p); - kfree(p); - readyToFormat = 0; - } else if (buff == 'c') { - serial_put((char) va_arg(args, int)); - readyToFormat = 0; - } - } else { - if (*fmt == '%') - readyToFormat = 1; - else - serial_put(*fmt); - } - } - - serial_put('\n'); - - va_end(args); + va_list args; + va_start(args, fmt); + + uint8_t readyToFormat = 0; + + char buff = 0; + + for (; *fmt; fmt++) { + if (readyToFormat) { + if (*fmt == '%') { + serial_put('%'); + readyToFormat = 0; + continue; + } + + buff = *fmt; + if (buff == 's') { + const char *str = va_arg(args, const char *); + _write_serial(str); + readyToFormat = 0; + } else if (buff == 'x') { + char *p = htoa((uint32_t)va_arg(args, int)); + _write_serial(p); + kfree(p); + readyToFormat = 0; + } else if (buff == 'd') { + char *p = itoa(va_arg(args, int)); + _write_serial(p); + kfree(p); + readyToFormat = 0; + } else if (buff == 'c') { + serial_put((char)va_arg(args, int)); + readyToFormat = 0; + } + } else { + if (*fmt == '%') + readyToFormat = 1; + else + serial_put(*fmt); + } + } + + serial_put('\n'); + + va_end(args); } \ No newline at end of file diff --git a/src/kernel/lib/stdio/getch.c b/src/kernel/lib/stdio/getch.c index f3ccbd9..e806013 100644 --- a/src/kernel/lib/stdio/getch.c +++ b/src/kernel/lib/stdio/getch.c @@ -3,9 +3,9 @@ char getch() { - keyboard_char_buffer = 0; - while (keyboard_char_buffer == 0) { - timer_wait(1); // IDK why! - } - return keyboard_char_buffer; + keyboard_char_buffer = 0; + while (keyboard_char_buffer == 0) { + timer_wait(1); // IDK why! + } + return keyboard_char_buffer; } \ No newline at end of file diff --git a/src/kernel/lib/stdio/printf.c b/src/kernel/lib/stdio/printf.c index accb97d..5c3eb8e 100644 --- a/src/kernel/lib/stdio/printf.c +++ b/src/kernel/lib/stdio/printf.c @@ -3,8 +3,8 @@ void printf(const char *fmt, ...) { - va_list args; - va_start(args, fmt); - vprintf(fmt, args); - va_end(args); + va_list args; + va_start(args, fmt); + vprintf(fmt, args); + va_end(args); } \ No newline at end of file diff --git a/src/kernel/lib/stdio/readline.c b/src/kernel/lib/stdio/readline.c index c65882d..1bda252 100644 --- a/src/kernel/lib/stdio/readline.c +++ b/src/kernel/lib/stdio/readline.c @@ -3,7 +3,8 @@ char *readline() { - keyboard_clear_buffer(); - while (keyboard_buffer[strlen(keyboard_buffer) - 1] != '\n') {} - return keyboard_buffer; + keyboard_clear_buffer(); + while (keyboard_buffer[strlen(keyboard_buffer) - 1] != '\n') { + } + return keyboard_buffer; } \ No newline at end of file diff --git a/src/kernel/lib/stdio/vprintf.c b/src/kernel/lib/stdio/vprintf.c index af8e47f..b9188c6 100644 --- a/src/kernel/lib/stdio/vprintf.c +++ b/src/kernel/lib/stdio/vprintf.c @@ -7,47 +7,48 @@ void _writes(const char *data) { - for (size_t i = 0; i < strlen(data); i++) writec(data[i]); + for (size_t i = 0; i < strlen(data); i++) + writec(data[i]); } void vprintf(const char *fmt, va_list args) { - uint8_t readyToFormat = 0; + uint8_t readyToFormat = 0; - char buff = 0; + char buff = 0; - for (; *fmt; fmt++) { - if (readyToFormat) { - if (*fmt == '%') { - writec('%'); - readyToFormat = 0; - continue; - } + for (; *fmt; fmt++) { + if (readyToFormat) { + if (*fmt == '%') { + writec('%'); + readyToFormat = 0; + continue; + } - buff = *fmt; - if (buff == 's') { - const char *str = va_arg(args, const char*); - _writes(str); - readyToFormat = 0; - } else if (buff == 'x') { - char *p = htoa((uint32_t) va_arg(args, int)); - _writes(p); - kfree(p); - readyToFormat = 0; - } else if (buff == 'd') { - char *p = itoa(va_arg(args, int)); - _writes(p); - kfree(p); - readyToFormat = 0; - } else if (buff == 'c') { - writec((char) va_arg(args, int)); - readyToFormat = 0; - } - } else { - if (*fmt == '%') - readyToFormat = 1; - else - writec(*fmt); - } - } + buff = *fmt; + if (buff == 's') { + const char *str = va_arg(args, const char *); + _writes(str); + readyToFormat = 0; + } else if (buff == 'x') { + char *p = htoa((uint32_t)va_arg(args, int)); + _writes(p); + kfree(p); + readyToFormat = 0; + } else if (buff == 'd') { + char *p = itoa(va_arg(args, int)); + _writes(p); + kfree(p); + readyToFormat = 0; + } else if (buff == 'c') { + writec((char)va_arg(args, int)); + readyToFormat = 0; + } + } else { + if (*fmt == '%') + readyToFormat = 1; + else + writec(*fmt); + } + } } \ No newline at end of file diff --git a/src/kernel/lib/stdio/writec.c b/src/kernel/lib/stdio/writec.c index 94d4fed..83b05de 100644 --- a/src/kernel/lib/stdio/writec.c +++ b/src/kernel/lib/stdio/writec.c @@ -2,5 +2,5 @@ void writec(char c) { - vesa_draw_char(c); + vesa_draw_char(c); } \ No newline at end of file -- cgit v1.2.3