diff options
| author | Aleksa Vuckovic <aleksa@vuckovic.cc> | 2023-02-25 06:56:01 +0100 |
|---|---|---|
| committer | Aleksa Vuckovic <aleksa@vuckovic.cc> | 2023-02-25 08:45:09 +0100 |
| commit | 239900af293f192931391dc5579afab39a43e6c6 (patch) | |
| tree | 72d7f87ee6adf5aa84b78436197e03e61fba8d97 /kernel/src/libk | |
| parent | aaa23fffd02fb49cdbc56a480dbb5a8fa95bff38 (diff) | |
clang-format
Diffstat (limited to 'kernel/src/libk')
| -rw-r--r-- | kernel/src/libk/list.c | 4 | ||||
| -rw-r--r-- | kernel/src/libk/math.c | 3 | ||||
| -rw-r--r-- | kernel/src/libk/mem.c | 0 | ||||
| -rw-r--r-- | kernel/src/libk/serial_stdio.c | 36 | ||||
| -rw-r--r-- | kernel/src/libk/stdio.c | 34 | ||||
| -rw-r--r-- | kernel/src/libk/string.c | 33 |
6 files changed, 61 insertions, 49 deletions
diff --git a/kernel/src/libk/list.c b/kernel/src/libk/list.c index 21dac16..fb7e20d 100644 --- a/kernel/src/libk/list.c +++ b/kernel/src/libk/list.c @@ -1,7 +1,7 @@ #include <libk/list.h> #include <heap.h> -void add_to_list(list_t* head, list_t* prev, list_t* next) +void add_to_list(list_t *head, list_t *prev, list_t *next) { head->prev = prev; head->next = next; @@ -9,7 +9,7 @@ void add_to_list(list_t* head, list_t* prev, list_t* next) next->prev = head; } -void free_node(list_t* head) +void free_node(list_t *head) { if (list_is_empty(head)) { head = NULL; diff --git a/kernel/src/libk/math.c b/kernel/src/libk/math.c index f625fb5..7e0046f 100644 --- a/kernel/src/libk/math.c +++ b/kernel/src/libk/math.c @@ -3,6 +3,7 @@ int64_t abs(int64_t val) { - if (val < 0) return -val; + if (val < 0) + return -val; return val; } diff --git a/kernel/src/libk/mem.c b/kernel/src/libk/mem.c deleted file mode 100644 index e69de29..0000000 --- a/kernel/src/libk/mem.c +++ /dev/null diff --git a/kernel/src/libk/serial_stdio.c b/kernel/src/libk/serial_stdio.c index 8c0c527..002eb9e 100644 --- a/kernel/src/libk/serial_stdio.c +++ b/kernel/src/libk/serial_stdio.c @@ -12,7 +12,7 @@ void serial_print_char(char c) write_serial(c); } -void serial_print_string(const char* s) +void serial_print_string(const char *s) { for (size_t i = 0; i < strlen(s); i++) { serial_print_char(s[i]); @@ -47,24 +47,30 @@ void serial_vprintf(const char *s, va_list list) { lock(serial_stdio_lock); size_t count = 0; - for(size_t i = 0; i < strlen(s); i++) if(s[i] == '%') count++; + for (size_t i = 0; i < strlen(s); i++) + if (s[i] == '%') + count++; - for(size_t i = 0; i < strlen(s); i++) - { - if(s[i] == '%') - { + for (size_t i = 0; i < strlen(s); i++) { + if (s[i] == '%') { i++; - if(s[i] == 'c') serial_print_char((char)va_arg(list, uint32_t)); - else if(s[i] == 's') serial_print_string(va_arg(list, char*)); - else if(s[i] == 'd') serial_print_int((uint64_t)va_arg(list, uint64_t)); - else if(s[i] == 'x') serial_print_hex((uint64_t)va_arg(list, uint64_t)); - else - { - serial_print_string("Wrong format using printf\n"); + if (s[i] == 'c') + serial_print_char((char)va_arg(list, uint32_t)); + else if (s[i] == 's') + serial_print_string(va_arg(list, char *)); + else if (s[i] == 'd') + serial_print_int( + (uint64_t)va_arg(list, uint64_t)); + else if (s[i] == 'x') + serial_print_hex( + (uint64_t)va_arg(list, uint64_t)); + else { + serial_print_string( + "Wrong format using printf\n"); return; } - } - else serial_print_char(s[i]); + } else + serial_print_char(s[i]); } unlock(serial_stdio_lock); } diff --git a/kernel/src/libk/stdio.c b/kernel/src/libk/stdio.c index 18f3d3f..f410ccd 100644 --- a/kernel/src/libk/stdio.c +++ b/kernel/src/libk/stdio.c @@ -27,13 +27,14 @@ void print_char(char c) } return; } - fb_draw_character(main_fb, c, (int32_t)main_fb.x * 8, (int32_t)main_fb.y * 16); + fb_draw_character(main_fb, c, (int32_t)main_fb.x * 8, + (int32_t)main_fb.y * 16); main_fb.x++; write_serial(c); } -void print_string(const char* s) +void print_string(const char *s) { for (size_t i = 0; i < strlen(s); i++) { print_char(s[i]); @@ -68,24 +69,27 @@ void vprintf(const char *s, va_list list) { lock(stdio_lock); size_t count = 0; - for(size_t i = 0; i < strlen(s); i++) if(s[i] == '%') count++; + for (size_t i = 0; i < strlen(s); i++) + if (s[i] == '%') + count++; - for(size_t i = 0; i < strlen(s); i++) - { - if(s[i] == '%') - { + for (size_t i = 0; i < strlen(s); i++) { + if (s[i] == '%') { i++; - if(s[i] == 'c') print_char((char)va_arg(list, uint32_t)); - else if(s[i] == 's') print_string(va_arg(list, char*)); - else if(s[i] == 'd') print_int((uint64_t)va_arg(list, uint64_t)); - else if(s[i] == 'x') print_hex((uint64_t)va_arg(list, uint64_t)); - else - { + if (s[i] == 'c') + print_char((char)va_arg(list, uint32_t)); + else if (s[i] == 's') + print_string(va_arg(list, char *)); + else if (s[i] == 'd') + print_int((uint64_t)va_arg(list, uint64_t)); + else if (s[i] == 'x') + print_hex((uint64_t)va_arg(list, uint64_t)); + else { print_string("Wrong format using printf\n"); return; } - } - else print_char(s[i]); + } else + print_char(s[i]); } unlock(stdio_lock); } diff --git a/kernel/src/libk/string.c b/kernel/src/libk/string.c index 8b2b2c6..b8fd659 100644 --- a/kernel/src/libk/string.c +++ b/kernel/src/libk/string.c @@ -1,13 +1,14 @@ #include <types.h> #include <libk/string.h> -size_t strlen(const char* s) +size_t strlen(const char *s) { if (s == NULL) return 0; - char *p = (char*)s; - while (*p) p++; + char *p = (char *)s; + while (*p) + p++; return (size_t)(p - s); } @@ -36,7 +37,7 @@ void strrev(char *s) } } -void itos(uint64_t num, char* s) +void itos(uint64_t num, char *s) { if (num == 0) { s[0] = '0'; @@ -52,7 +53,7 @@ void itos(uint64_t num, char* s) strrev(s); } -void itoh(uint64_t num, char* s) +void itoh(uint64_t num, char *s) { if (num == 0) { s[0] = '0'; @@ -71,35 +72,35 @@ void itoh(uint64_t num, char* s) strrev(s); } -void memcpy(const void* destptr, const void* srcptr, size_t n) +void memcpy(const void *destptr, const void *srcptr, size_t n) { if (destptr == NULL || srcptr == NULL) return; - uint8_t* dest = (uint8_t*)destptr; - const uint8_t* src = (const uint8_t*)srcptr; + uint8_t *dest = (uint8_t *)destptr; + const uint8_t *src = (const uint8_t *)srcptr; - for(size_t i = 0; i < n; i++) { + for (size_t i = 0; i < n; i++) { dest[i] = src[i]; } } -void memset(const void* destptr, uint8_t value, size_t n) +void memset(const void *destptr, uint8_t value, size_t n) { - uint8_t* dest = (uint8_t*)destptr; + uint8_t *dest = (uint8_t *)destptr; for (size_t i = 0; i < n; i++) { dest[i] = value; } } -int32_t memcmp(const void* aptr, const void* bptr) +int32_t memcmp(const void *aptr, const void *bptr) { - const uint8_t* a = (const uint8_t*)aptr; - const uint8_t* b = (const uint8_t*)bptr; + const uint8_t *a = (const uint8_t *)aptr; + const uint8_t *b = (const uint8_t *)bptr; - const size_t len_a = strlen((char*)a); - const size_t len_b = strlen((char*)b); + const size_t len_a = strlen((char *)a); + const size_t len_b = strlen((char *)b); for (size_t i = 0; i < len_a && i < len_b; i++) { if (a[i] != b[i]) |
