Added *many* static keywords

10 files changed, 44 insertions, 41 deletions

diff --git a/libc/conv.c b/libc/conv.c
index d0a9a59..670fdb3 100644
--- a/libc/conv.c
+++ b/libc/conv.c
@@ -1,5 +1,6 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
+#include <conv.h>
 #include <def.h>
 #include <math.h>
 #include <mem.h>
diff --git a/libc/cpu.c b/libc/cpu.c
index 983a4a8..9ade464 100644
--- a/libc/cpu.c
+++ b/libc/cpu.c
@@ -95,12 +95,12 @@ static void cr4_set(u32 cr4)
 }
 
 static u32 cpu_features = 0;
-u8 cpu_has_feature(u32 feature)
+static u8 cpu_has_feature(u32 feature)
 {
 	return (cpu_features & feature) != 0;
 }
 
-void fpu_handler()
+static void fpu_handler()
 {
 	__asm__ volatile("clts");
 }
diff --git a/libc/inc/math.h b/libc/inc/math.h
index 268e3e7..82f431f 100644
--- a/libc/inc/math.h
+++ b/libc/inc/math.h
@@ -3,8 +3,6 @@
 #ifndef MATH_H
 #define MATH_H
 
-#include <def.h>
-
 int pow(int base, int exp);
 
 #endif
diff --git a/libc/list.c b/libc/list.c
index 6e1f95d..330d65d 100644
--- a/libc/list.c
+++ b/libc/list.c
@@ -29,7 +29,7 @@ void list_destroy(struct list *list)
 	list = NULL;
 }
 
-struct node *list_new_node()
+static struct node *list_new_node()
 {
 	struct node *node = malloc(sizeof(*node));
 	node->data = NULL;
@@ -39,7 +39,7 @@ struct node *list_new_node()
 	return node;
 }
 
-struct node *list_add_node(struct list *list, struct node *node)
+static struct node *list_add_node(struct list *list, struct node *node)
 {
 	if (!list || !node)
 		return NULL;
diff --git a/libc/math.c b/libc/math.c
index 9cd9cea..c8142b5 100644
--- a/libc/math.c
+++ b/libc/math.c
@@ -1,5 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
+#include <math.h>
+
 int pow(int base, int exp)
 {
 	if (exp < 0)
diff --git a/libc/mem.c b/libc/mem.c
index b70f8ef..ba267f2 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -157,7 +157,7 @@ struct heap {
 	struct h_bin bins[BIN_COUNT];
 };
 
-void node_add(struct h_bin *bin, struct h_node *node)
+static void node_add(struct h_bin *bin, struct h_node *node)
 {
 	node->magic = HEAP_MAGIC;
 	node->next = NULL;
@@ -187,7 +187,7 @@ void node_add(struct h_bin *bin, struct h_node *node)
 	}
 }
 
-void node_remove(struct h_bin *bin, struct h_node *node)
+static void node_remove(struct h_bin *bin, struct h_node *node)
 {
 	if (!bin->head)
 		return;
@@ -211,7 +211,7 @@ void node_remove(struct h_bin *bin, struct h_node *node)
 	}
 }
 
-struct h_node *node_best_fit(struct h_bin *bin, u32 size)
+static struct h_node *node_best_fit(struct h_bin *bin, u32 size)
 {
 	if (!bin->head)
 		return NULL;
@@ -225,26 +225,26 @@ struct h_node *node_best_fit(struct h_bin *bin, u32 size)
 	return NULL;
 }
 
-struct h_node *node_last(struct h_bin *bin)
-{
-	struct h_node *temp = bin->head;
-	while (temp->next)
-		temp = temp->next;
-	return temp;
-}
+/* static struct h_node *node_last(struct h_bin *bin) */
+/* { */
+/* 	struct h_node *temp = bin->head; */
+/* 	while (temp->next) */
+/* 		temp = temp->next; */
+/* 	return temp; */
+/* } */
 
-struct h_footer *node_foot(struct h_node *node)
+static struct h_footer *node_foot(struct h_node *node)
 {
 	return (struct h_footer *)((char *)node + sizeof(*node) + node->size);
 }
 
-void node_create_foot(struct h_node *head)
+static void node_create_foot(struct h_node *head)
 {
 	struct h_footer *foot = node_foot(head);
 	foot->header = head;
 }
 
-u32 bin_index(u32 sz)
+static u32 bin_index(u32 sz)
 {
 	u32 index = 0;
 	sz = sz < 4 ? 4 : sz;
@@ -262,19 +262,19 @@ u32 bin_index(u32 sz)
 /* 	return wild_foot->header; */
 /* } */
 
-u32 expand(struct heap *heap, u32 sz)
-{
-	(void)heap;
-	(void)sz;
-	return 0;
-}
+/* static u32 expand(struct heap *heap, u32 sz) */
+/* { */
+/* 	(void)heap; */
+/* 	(void)sz; */
+/* 	return 0; */
+/* } */
 
-u32 contract(struct heap *heap, u32 sz)
-{
-	(void)heap;
-	(void)sz;
-	return 0;
-}
+/* static u32 contract(struct heap *heap, u32 sz) */
+/* { */
+/* 	(void)heap; */
+/* 	(void)sz; */
+/* 	return 0; */
+/* } */
 
 static struct heap heap = { 0 };
 void heap_init(u32 start)
@@ -288,7 +288,7 @@ void heap_init(u32 start)
 	heap.end = start + HEAP_INIT_SIZE;
 }
 
-void *_malloc(u32 size)
+static void *_malloc(u32 size)
 {
 	malloc_allocated += size;
 	u32 index = bin_index(size);
@@ -336,7 +336,7 @@ void *_malloc(u32 size)
 	return &found->next;
 }
 
-void _free(void *p)
+static void _free(void *p)
 {
 	if (!p)
 		return;
@@ -392,12 +392,12 @@ void _free(void *p)
 #define kmalloc(n) (void *)sys1(SYS_MALLOC, n)
 #define kfree(ptr) (void)(sys1(SYS_FREE, (int)ptr))
 
-void *_malloc(u32 size)
+static void *_malloc(u32 size)
 {
 	return kmalloc(size);
 }
 
-void _free(void *ptr)
+static void _free(void *ptr)
 {
 	kfree(ptr);
 }
diff --git a/libc/print.c b/libc/print.c
index 3d64504..6d97599 100644
--- a/libc/print.c
+++ b/libc/print.c
@@ -168,7 +168,7 @@ int print(const char *str)
 #define WHT "\x1B[1;37m"
 #define RES "\x1B[0m"
 
-void print_kernel(const char *str)
+static void print_kernel(const char *str)
 {
 	serial_print(RED);
 	serial_print("[KER] ");
diff --git a/libc/serial.c b/libc/serial.c
index 28de140..62263fb 100644
--- a/libc/serial.c
+++ b/libc/serial.c
@@ -2,6 +2,7 @@
 
 #include <cpu.h>
 #include <def.h>
+#include <serial.h>
 #include <str.h>
 
 void serial_install()
@@ -15,12 +16,12 @@ void serial_install()
 	outb(0x3f8 + 4, 0x0B);
 }
 
-int is_transmit_empty()
+static int is_transmit_empty()
 {
 	return inb(0x3f8 + 5) & 0x20;
 }
 
-void serial_put(char ch)
+static void serial_put(char ch)
 {
 	while (is_transmit_empty() == 0)
 		;
diff --git a/libc/stack.c b/libc/stack.c
index cd5a2aa..0941e29 100644
--- a/libc/stack.c
+++ b/libc/stack.c
@@ -29,7 +29,7 @@ void stack_destroy(struct stack *stack)
 	stack = NULL;
 }
 
-struct stack_node *stack_new_node()
+static struct stack_node *stack_new_node()
 {
 	struct stack_node *node = malloc(sizeof(*node));
 	node->data = NULL;
@@ -39,7 +39,7 @@ struct stack_node *stack_new_node()
 	return node;
 }
 
-u32 stack_push_bot_node(struct stack *stack, struct stack_node *node)
+static u32 stack_push_bot_node(struct stack *stack, struct stack_node *node)
 {
 	if (!stack || !node)
 		return 0;
@@ -60,7 +60,7 @@ u32 stack_push_bot_node(struct stack *stack, struct stack_node *node)
 	return 1;
 }
 
-u32 stack_push_node(struct stack *stack, struct stack_node *node)
+static u32 stack_push_node(struct stack *stack, struct stack_node *node)
 {
 	if (!stack || !node)
 		return 0;
diff --git a/libc/str.c b/libc/str.c
index b8d4fb1..bf60d86 100644
--- a/libc/str.c
+++ b/libc/str.c
@@ -2,6 +2,7 @@
 
 #include <def.h>
 #include <mem.h>
+#include <str.h>
 
 u32 strlen(const char *s)
 {