Fix function names and prototypes for klibc's heap implementation

diff --git a/kernel/include/kheap.h b/kernel/include/kheap.h
index d91bbb87cc8e79337e7ef9f9c268cd21f914f2fd..edfe618813267f5f48cd9d538171341c20a2e168 100644 (file)
--- a/kernel/include/kheap.h
+++ b/kernel/include/kheap.h
@@ -14,9 +14,9 @@ typedef struct {
        size_t     h_free;
 } kheap_t;
 
-int kheap_init(kheap_t*, size_t);
-int kheap_alloc(kheap_t*, size_t, void**);
-int kheap_free(kheap_t*, void*);
+int   kheap_init(kheap_t*, size_t);
+void* kheap_alloc(kheap_t*, size_t);
+void  kheap_free(kheap_t*, void*);
 
 
 #endif /* __KHEAP_H */

diff --git a/kernel/klibc/heap.c b/kernel/klibc/heap.c
index 6c06c950b1088783070a0f499bec2e298fa250bb..299edb6d5dd34840c483009871f072d8c10b34ec 100644 (file)
--- a/kernel/klibc/heap.c
+++ b/kernel/klibc/heap.c
@@ -79,7 +79,7 @@ static int _kheap_grow(kheap_t *heap, const size_t size)
        return(ret_val);
 }
 
-void* heap_alloc(kheap_t *heap, size_t size)
+void* kheap_alloc(kheap_t *heap, size_t size)
 {
        struct heap_node *cur;
        void *ret_val;
@@ -137,7 +137,7 @@ void* heap_alloc(kheap_t *heap, size_t size)
        return(ret_val);
 }
 
-void heap_free(kheap_t *heap, void *ptr)
+void kheap_free(kheap_t *heap, void *ptr)
 {
        struct heap_node *cur;