From 25537c3d3b9b68af91573dec39d1f46c3d97f735 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Fri, 10 Dec 2021 09:16:08 -0800 Subject: Checkin: small sprawling updates Small touches to multiple locations in base. Nothing major --- src/base/mem/arena.c | 4 ++-- src/base/mem/compare.c | 2 +- src/base/mem/interface.c | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'src/base/mem') diff --git a/src/base/mem/arena.c b/src/base/mem/arena.c index cb1af74..32c4ea8 100644 --- a/src/base/mem/arena.c +++ b/src/base/mem/arena.c @@ -26,13 +26,13 @@ struct mem·Arena }; static void* -·arenaalloc(void *heap, long n, uintptr size) +·arenaalloc(void *heap, uintptr n, uintptr size) { return mem·arenaalloc(heap, n, size); } static void* -·arenarealloc(void *heap, void *old, long n, uintptr size) +·arenarealloc(void *heap, void *old, uintptr n, uintptr size) { /* does not free */ return mem·arenaalloc(heap, n, size); diff --git a/src/base/mem/compare.c b/src/base/mem/compare.c index a2cdd1f..eadd1fa 100644 --- a/src/base/mem/compare.c +++ b/src/base/mem/compare.c @@ -1,7 +1,7 @@ #include int -mem·compare(void *qry, void *ref, uintptr size) +mem·compare(void *qry, uintptr size, void *ref) { intptr i; char *q=qry, *r=ref; diff --git a/src/base/mem/interface.c b/src/base/mem/interface.c index aa76c85..374fac0 100644 --- a/src/base/mem/interface.c +++ b/src/base/mem/interface.c @@ -6,17 +6,12 @@ static void } static void * -·alloc(void *_, uint n, ulong size) { - return malloc(n*size); -} - -static void * -·calloc(void *_, long n, ulong size) { +·calloc(void *_, uintptr n, uintptr size) { return calloc(n, size); } static void * -·realloc(void *_, void *ptr, long n, ulong size) { +·realloc(void *_, void *ptr, uintptr n, uintptr size) { return realloc(ptr, n*size); } -- cgit v1.2.1