From d3e6e087124240d61d0f7d790dcb9c873f78f35f Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Wed, 18 Dec 2019 15:57:01 +0900 Subject: [PATCH] Fix function names and prototypes for klibc's heap implementation --- kernel/include/kheap.h | 6 +++--- kernel/klibc/heap.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/include/kheap.h b/kernel/include/kheap.h index d91bbb8..edfe618 100644 --- 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 6c06c95..299edb6 100644 --- 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; -- 2.47.3