From 9b2e28ad7a752c0fe7b60e73ca43c827b45b3ee8 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 7 May 2020 22:19:13 +0200
Subject: Added and applied include-sorting

Worked better than I thought!
---
 src/kernel/lib/data/list.c     | 6 +++---
 src/kernel/lib/data/tree.c     | 2 +-
 src/kernel/lib/lib.h           | 2 +-
 src/kernel/lib/memory.c        | 6 +++---
 src/kernel/lib/stdio/debug.c   | 8 ++++----
 src/kernel/lib/stdio/printf.c  | 2 +-
 src/kernel/lib/stdio/vprintf.c | 6 +++---
 src/kernel/lib/stdlib/atoi.c   | 2 +-
 src/kernel/lib/stdlib/htoa.c   | 2 +-
 src/kernel/lib/stdlib/htoi.c   | 2 +-
 src/kernel/lib/stdlib/itoa.c   | 2 +-
 src/kernel/lib/string.h        | 2 +-
 src/kernel/lib/string/strstr.c | 2 +-
 13 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/kernel/lib')

diff --git a/src/kernel/lib/data/list.c b/src/kernel/lib/data/list.c
index 41f812f..7ecc950 100644
--- a/src/kernel/lib/data/list.c
+++ b/src/kernel/lib/data/list.c
@@ -1,9 +1,9 @@
-#include <stdint.h>
-#include <stddef.h>
+#include <lib/data.h>
 #include <lib/lib.h>
 #include <lib/stdlib.h>
-#include <lib/data.h>
 #include <memory/alloc.h>
+#include <stddef.h>
+#include <stdint.h>
 
 struct list *list_create()
 {
diff --git a/src/kernel/lib/data/tree.c b/src/kernel/lib/data/tree.c
index 2726a11..65b8433 100644
--- a/src/kernel/lib/data/tree.c
+++ b/src/kernel/lib/data/tree.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <lib/data.h>
 #include <memory/alloc.h>
+#include <stdint.h>
 
 struct tree *tree_create()
 {
diff --git a/src/kernel/lib/lib.h b/src/kernel/lib/lib.h
index 4308af4..921e575 100644
--- a/src/kernel/lib/lib.h
+++ b/src/kernel/lib/lib.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_LIB_H
 #define MELVIX_LIB_H
 
+#include <multiboot.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <multiboot.h>
 
 /**
  * Copy n data from src to dest
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c
index 192e08d..61b1414 100644
--- a/src/kernel/lib/memory.c
+++ b/src/kernel/lib/memory.c
@@ -1,9 +1,9 @@
-#include <stddef.h>
-#include <stdint.h>
-#include <system.h>
 #include <lib/stdio.h>
 #include <memory/paging.h>
 #include <multiboot.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <system.h>
 
 void *memcpy(void *dest, const void *src, u32 count)
 {
diff --git a/src/kernel/lib/stdio/debug.c b/src/kernel/lib/stdio/debug.c
index a96d73a..74eb594 100644
--- a/src/kernel/lib/stdio/debug.c
+++ b/src/kernel/lib/stdio/debug.c
@@ -1,9 +1,9 @@
-#include <stdarg.h>
-#include <stdint.h>
-#include <lib/string.h>
-#include <lib/stdlib.h>
 #include <io/io.h>
+#include <lib/stdlib.h>
+#include <lib/string.h>
 #include <memory/alloc.h>
+#include <stdarg.h>
+#include <stdint.h>
 
 void serial_print(const char *data)
 {
diff --git a/src/kernel/lib/stdio/printf.c b/src/kernel/lib/stdio/printf.c
index cc65463..c1b08e7 100644
--- a/src/kernel/lib/stdio/printf.c
+++ b/src/kernel/lib/stdio/printf.c
@@ -1,5 +1,5 @@
-#include <stdarg.h>
 #include <lib/stdio.h>
+#include <stdarg.h>
 
 void printf(const char *fmt, ...)
 {
diff --git a/src/kernel/lib/stdio/vprintf.c b/src/kernel/lib/stdio/vprintf.c
index 15d210a..37723b2 100644
--- a/src/kernel/lib/stdio/vprintf.c
+++ b/src/kernel/lib/stdio/vprintf.c
@@ -1,9 +1,9 @@
-#include <stdarg.h>
-#include <stdint.h>
 #include <lib/stdio.h>
-#include <lib/string.h>
 #include <lib/stdlib.h>
+#include <lib/string.h>
 #include <memory/alloc.h>
+#include <stdarg.h>
+#include <stdint.h>
 
 void _puts(const char *data)
 {
diff --git a/src/kernel/lib/stdlib/atoi.c b/src/kernel/lib/stdlib/atoi.c
index cd855ab..b90958a 100644
--- a/src/kernel/lib/stdlib/atoi.c
+++ b/src/kernel/lib/stdlib/atoi.c
@@ -1,7 +1,7 @@
 #include <lib/math.h>
+#include <lib/string.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <lib/string.h>
 
 int atoi(char *str)
 {
diff --git a/src/kernel/lib/stdlib/htoa.c b/src/kernel/lib/stdlib/htoa.c
index 7a535dd..c4dbd5e 100644
--- a/src/kernel/lib/stdlib/htoa.c
+++ b/src/kernel/lib/stdlib/htoa.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <lib/string.h>
 #include <memory/alloc.h>
+#include <stdint.h>
 
 static const char HTOA_TABLE[] = "0123456789ABCDEF";
 
diff --git a/src/kernel/lib/stdlib/htoi.c b/src/kernel/lib/stdlib/htoi.c
index 7d05239..367d30e 100644
--- a/src/kernel/lib/stdlib/htoi.c
+++ b/src/kernel/lib/stdlib/htoi.c
@@ -1,6 +1,6 @@
 #include <lib/math.h>
-#include <stddef.h>
 #include <lib/string.h>
+#include <stddef.h>
 
 int htoi(char *str)
 {
diff --git a/src/kernel/lib/stdlib/itoa.c b/src/kernel/lib/stdlib/itoa.c
index 165e260..b4a9db1 100644
--- a/src/kernel/lib/stdlib/itoa.c
+++ b/src/kernel/lib/stdlib/itoa.c
@@ -1,8 +1,8 @@
 #include <lib/math.h>
-#include <stdint.h>
 #include <lib/string.h>
 #include <memory/alloc.h>
 #include <memory/paging.h>
+#include <stdint.h>
 
 static const char ITOA_TABLE[] = "0123456789";
 
diff --git a/src/kernel/lib/string.h b/src/kernel/lib/string.h
index bd412d7..127dcc4 100644
--- a/src/kernel/lib/string.h
+++ b/src/kernel/lib/string.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_STRING_H
 #define MELVIX_STRING_H
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 u32 strlen(const char *str);
 
diff --git a/src/kernel/lib/string/strstr.c b/src/kernel/lib/string/strstr.c
index bcf1539..720df8c 100644
--- a/src/kernel/lib/string/strstr.c
+++ b/src/kernel/lib/string/strstr.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <lib/stdlib.h>
+#include <stdint.h>
 
 char *strstr(const char *in, const char *str)
 {
-- 
cgit v1.2.3