From bb57b124d1bb385d41747f50be7dd4f3625539c1 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 24 Nov 2019 23:34:32 +0100
Subject: Major coding style reformatting -> Kernighan & Ritchie

This project now (hopefully) uses the same style recommended by Kernighan and Ritchie and used in the Linux Kernel
---
 src/mlibc/math/pow.c        |  3 ++-
 src/mlibc/stdio/printf.c    |  6 ++++--
 src/mlibc/stdio/writec.c    |  3 ++-
 src/mlibc/stdlib.h          |  4 ++++
 src/mlibc/stdlib/atoi.c     |  3 ++-
 src/mlibc/stdlib/htoa.c     |  3 ++-
 src/mlibc/stdlib/htoi.c     |  3 ++-
 src/mlibc/stdlib/itoa.c     |  3 ++-
 src/mlibc/stdlib/liballoc.c | 41 ++++++++++++++++++++++++++---------------
 src/mlibc/string/strcat.c   |  3 ++-
 src/mlibc/string/strcati.c  |  3 ++-
 src/mlibc/string/strcmp.c   |  3 ++-
 src/mlibc/string/strcpy.c   |  3 ++-
 src/mlibc/string/strdisp.c  |  6 ++++--
 src/mlibc/string/strdup.c   |  3 ++-
 src/mlibc/string/strinv.c   |  3 ++-
 src/mlibc/string/strlen.c   |  3 ++-
 17 files changed, 64 insertions(+), 32 deletions(-)

(limited to 'src/mlibc')

diff --git a/src/mlibc/math/pow.c b/src/mlibc/math/pow.c
index 4f040bb..24670a0 100644
--- a/src/mlibc/math/pow.c
+++ b/src/mlibc/math/pow.c
@@ -1,4 +1,5 @@
-int pow(int base, int exp) {
+int pow(int base, int exp)
+{
     if (exp < 0) return 0;
 
     if (!exp) return 1;
diff --git a/src/mlibc/stdio/printf.c b/src/mlibc/stdio/printf.c
index 11516cf..23d8e6e 100644
--- a/src/mlibc/stdio/printf.c
+++ b/src/mlibc/stdio/printf.c
@@ -4,11 +4,13 @@
 #include <mlibc/string.h>
 #include <mlibc/stdlib.h>
 
-void __writes(const char *data) {
+void __writes(const char *data)
+{
     for (size_t i = 0; i < strlen(data); i++) writec(data[i]);
 }
 
-void printf(const char *fmt, ...) {
+void printf(const char *fmt, ...)
+{
     va_list args;
     va_start(args, fmt);
 
diff --git a/src/mlibc/stdio/writec.c b/src/mlibc/stdio/writec.c
index 60f69e8..94d4fed 100644
--- a/src/mlibc/stdio/writec.c
+++ b/src/mlibc/stdio/writec.c
@@ -1,5 +1,6 @@
 #include <kernel/graphics/vesa.h>
 
-void writec(char c) {
+void writec(char c)
+{
     vesa_draw_char(c);
 }
\ No newline at end of file
diff --git a/src/mlibc/stdlib.h b/src/mlibc/stdlib.h
index 7ae9c5a..36a3b5f 100644
--- a/src/mlibc/stdlib.h
+++ b/src/mlibc/stdlib.h
@@ -4,11 +4,15 @@
 #include <stdint.h>
 
 #ifndef MELVIX_ALLOC_H
+
 #include <mlibc/stdlib/liballoc.h>
+
 #endif
 
 #ifndef MELVIX_STRING_H
+
 #include <mlibc/string.h>
+
 #endif
 
 char *itoa(int n);
diff --git a/src/mlibc/stdlib/atoi.c b/src/mlibc/stdlib/atoi.c
index 34f9991..0643372 100644
--- a/src/mlibc/stdlib/atoi.c
+++ b/src/mlibc/stdlib/atoi.c
@@ -3,7 +3,8 @@
 #include <stdint.h>
 #include <mlibc/string.h>
 
-int atoi(char *str) {
+int atoi(char *str)
+{
     size_t s_str = strlen(str);
     if (!s_str) return 0;
 
diff --git a/src/mlibc/stdlib/htoa.c b/src/mlibc/stdlib/htoa.c
index 5290c74..ab20260 100644
--- a/src/mlibc/stdlib/htoa.c
+++ b/src/mlibc/stdlib/htoa.c
@@ -4,7 +4,8 @@
 
 static const char __HTOA_TABLE[] = "0123456789ABCDEF";
 
-char *htoa(uint32_t n) {
+char *htoa(uint32_t n)
+{
     char *ret = kmalloc(10);
 
     int i = 0;
diff --git a/src/mlibc/stdlib/htoi.c b/src/mlibc/stdlib/htoi.c
index 73a583b..c78fe9d 100644
--- a/src/mlibc/stdlib/htoi.c
+++ b/src/mlibc/stdlib/htoi.c
@@ -2,7 +2,8 @@
 #include <stddef.h>
 #include <mlibc/string.h>
 
-int htoi(char *str) {
+int htoi(char *str)
+{
     size_t s_str = strlen(str);
 
     size_t i = 0;
diff --git a/src/mlibc/stdlib/itoa.c b/src/mlibc/stdlib/itoa.c
index 8c557ab..3c8ee05 100644
--- a/src/mlibc/stdlib/itoa.c
+++ b/src/mlibc/stdlib/itoa.c
@@ -6,7 +6,8 @@
 
 static const char __ITOA_TABLE[] = "0123456789";
 
-char *itoa(int n) {
+char *itoa(int n)
+{
     if (paging_enabled == 0)
         return "0"; // kmalloc isn't available
 
diff --git a/src/mlibc/stdlib/liballoc.c b/src/mlibc/stdlib/liballoc.c
index f4015f2..3938215 100644
--- a/src/mlibc/stdlib/liballoc.c
+++ b/src/mlibc/stdlib/liballoc.c
@@ -3,22 +3,26 @@
 #include <kernel/paging/paging.h>
 #include <mlibc/stdlib/liballoc.h>
 
-int liballoc_lock() {
-    // asm volatile ("cli");
+int liballoc_lock()
+{
+    // asm ("cli");
     return 0;
 }
 
-int liballoc_unlock() {
-    // asm volatile ("sti");
+int liballoc_unlock()
+{
+    // asm ("sti");
     return 0;
 }
 
-void *liballoc_alloc(size_t p) {
+void *liballoc_alloc(size_t p)
+{
     uint32_t ptr = paging_alloc_pages((uint32_t) p);
     return (void *) ptr;
 }
 
-int liballoc_free(void *ptr, size_t p) {
+int liballoc_free(void *ptr, size_t p)
+{
     paging_set_free((uint32_t) ptr, (uint32_t) p);
     return 0;
 }
@@ -52,8 +56,8 @@ int liballoc_free(void *ptr, size_t p) {
             } \
         }
 
-#define LIBALLOC_MAGIC 0xc001c0de
-#define LIBALLOC_DEAD 0xdeaddead
+#define LIBALLOC_MAGIC 0x900df00d
+#define LIBALLOC_DEAD 0xbaadf00d
 
 struct liballoc_major {
     struct liballoc_major *prev;
@@ -85,7 +89,8 @@ static long long l_warningCount = 0;
 static long long l_errorCount = 0;
 static long long l_possibleOverruns = 0;
 
-static void *liballoc_memset(void *s, int c, size_t n) {
+static void *liballoc_memset(void *s, int c, size_t n)
+{
     unsigned int i;
     for (i = 0; i < n; i++)
         ((char *) s)[i] = c;
@@ -93,7 +98,8 @@ static void *liballoc_memset(void *s, int c, size_t n) {
     return s;
 }
 
-static void *liballoc_memcpy(void *s1, const void *s2, size_t n) {
+static void *liballoc_memcpy(void *s1, const void *s2, size_t n)
+{
     char *cdest;
     char *csrc;
     unsigned int *ldest = (unsigned int *) s1;
@@ -114,7 +120,8 @@ static void *liballoc_memcpy(void *s1, const void *s2, size_t n) {
     return s1;
 }
 
-static struct liballoc_major *allocate_new_page(unsigned int size) {
+static struct liballoc_major *allocate_new_page(unsigned int size)
+{
     unsigned int st;
     struct liballoc_major *maj;
 
@@ -147,7 +154,8 @@ static struct liballoc_major *allocate_new_page(unsigned int size) {
     return maj;
 }
 
-void *PREFIX(malloc)(size_t req_size) {
+void *PREFIX(malloc)(size_t req_size)
+{
     int startedBet = 0;
     unsigned long long bestSize = 0;
     void *p = NULL;
@@ -334,7 +342,8 @@ void *PREFIX(malloc)(size_t req_size) {
     return NULL;
 }
 
-void PREFIX(free)(void *ptr) {
+void PREFIX(free)(void *ptr)
+{
     struct liballoc_minor *min;
     struct liballoc_major *maj;
 
@@ -386,7 +395,8 @@ void PREFIX(free)(void *ptr) {
     liballoc_unlock();
 }
 
-void *PREFIX(calloc)(size_t nobj, size_t size) {
+void *PREFIX(calloc)(size_t nobj, size_t size)
+{
     int real_size;
     void *p;
 
@@ -399,7 +409,8 @@ void *PREFIX(calloc)(size_t nobj, size_t size) {
     return p;
 }
 
-void *PREFIX(realloc)(void *p, size_t size) {
+void *PREFIX(realloc)(void *p, size_t size)
+{
     void *ptr;
     struct liballoc_minor *min;
     unsigned int real_size;
diff --git a/src/mlibc/string/strcat.c b/src/mlibc/string/strcat.c
index 3cc56f1..0448430 100644
--- a/src/mlibc/string/strcat.c
+++ b/src/mlibc/string/strcat.c
@@ -1,6 +1,7 @@
 #include <mlibc/string.h>
 
-void strcat(char *dest, const char *orig) {
+void strcat(char *dest, const char *orig)
+{
     size_t s_dest = strlen(dest);
     size_t s_orig = strlen(orig);
 
diff --git a/src/mlibc/string/strcati.c b/src/mlibc/string/strcati.c
index d925eb7..8fdcc1a 100644
--- a/src/mlibc/string/strcati.c
+++ b/src/mlibc/string/strcati.c
@@ -1,6 +1,7 @@
 #include <mlibc/string.h>
 
-void strcati(char *dest, const char *orig) {
+void strcati(char *dest, const char *orig)
+{
     size_t s_orig = strlen(orig);
     strdisp(dest, (int) s_orig);
     for (size_t i = 0; i < s_orig; i++) dest[i] = orig[i];
diff --git a/src/mlibc/string/strcmp.c b/src/mlibc/string/strcmp.c
index cc719da..be6c17a 100644
--- a/src/mlibc/string/strcmp.c
+++ b/src/mlibc/string/strcmp.c
@@ -1,6 +1,7 @@
 #include <mlibc/string.h>
 
-char strcmp(const char *a, const char *b) {
+char strcmp(const char *a, const char *b)
+{
     if (strlen(a) != strlen(b)) return 1;
 
     for (size_t i = 0; i < strlen(a); i++) if (a[i] != b[i]) return 1;
diff --git a/src/mlibc/string/strcpy.c b/src/mlibc/string/strcpy.c
index 5a1ff4e..8dfa65f 100644
--- a/src/mlibc/string/strcpy.c
+++ b/src/mlibc/string/strcpy.c
@@ -1,6 +1,7 @@
 #include <mlibc/string.h>
 
-void strcpy(char *dest, const char *orig) {
+void strcpy(char *dest, const char *orig)
+{
     size_t s_orig = strlen(orig);
 
     for (size_t i = 0; i < s_orig; i++) dest[i] = orig[i];
diff --git a/src/mlibc/string/strdisp.c b/src/mlibc/string/strdisp.c
index 6feb4ca..d793718 100644
--- a/src/mlibc/string/strdisp.c
+++ b/src/mlibc/string/strdisp.c
@@ -1,10 +1,12 @@
 #include <mlibc/string.h>
 
-void strdisponce(char *str) {
+void strdisponce(char *str)
+{
     for (size_t i = sizeof(str) + 2; i > 0; i--) str[i] = str[i - 1];
     str[0] = 0;
 }
 
-void strdisp(char *str, int n) {
+void strdisp(char *str, int n)
+{
     for (int i = 0; i < n; i++) strdisponce(str);
 }
\ No newline at end of file
diff --git a/src/mlibc/string/strdup.c b/src/mlibc/string/strdup.c
index 0cddd79..0aa36f7 100644
--- a/src/mlibc/string/strdup.c
+++ b/src/mlibc/string/strdup.c
@@ -1,7 +1,8 @@
 #include <mlibc/string.h>
 #include <mlibc/stdlib.h>
 
-char *strdup(const char *orig) {
+char *strdup(const char *orig)
+{
     size_t s_orig = strlen(orig);
     char *ret = kmalloc(s_orig + 1);
     strcpy(ret, orig);
diff --git a/src/mlibc/string/strinv.c b/src/mlibc/string/strinv.c
index c6dd7fd..71f3355 100644
--- a/src/mlibc/string/strinv.c
+++ b/src/mlibc/string/strinv.c
@@ -1,6 +1,7 @@
 #include <mlibc/string.h>
 
-void strinv(char *str) {
+void strinv(char *str)
+{
     size_t s_str = strlen(str);
 
     int iterations = (int) s_str / 2;
diff --git a/src/mlibc/string/strlen.c b/src/mlibc/string/strlen.c
index 1143683..133ee3d 100644
--- a/src/mlibc/string/strlen.c
+++ b/src/mlibc/string/strlen.c
@@ -1,6 +1,7 @@
 #include <mlibc/string.h>
 
-size_t strlen(const char *str) {
+size_t strlen(const char *str)
+{
     size_t len = 0;
     while (str[len]) len++;
     return len;
-- 
cgit v1.2.3