aboutsummaryrefslogtreecommitdiff
path: root/src/base/mem
diff options
context:
space:
mode:
authorNicholas Noll <nbnoll@eml.cc>2021-12-10 09:16:08 -0800
committerNicholas Noll <nbnoll@eml.cc>2021-12-10 09:16:08 -0800
commit25537c3d3b9b68af91573dec39d1f46c3d97f735 (patch)
tree3f2ea6207a28fe9610d767dd78fb24d17f858ce0 /src/base/mem
parentf4aef385bdd41b02ef58b5366fa9318ecdc6e37e (diff)
Checkin: small sprawling updates
Small touches to multiple locations in base. Nothing major
Diffstat (limited to 'src/base/mem')
-rw-r--r--src/base/mem/arena.c4
-rw-r--r--src/base/mem/compare.c2
-rw-r--r--src/base/mem/interface.c9
3 files changed, 5 insertions, 10 deletions
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 <u.h>
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);
}