[v3 PATCH 11/13] memalloc: Use void * instead of pointer

Herbert Xu
2024-05-05T09:15:25Z

Use void * instead of the obsolete pointer typedef.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
src/memalloc.c | 16 ++++++----------
src/memalloc.h | 10 +++++-----
2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/memalloc.c b/src/memalloc.c
index 60637da..7aa8c58 100644
--- a/src/memalloc.c
+++ b/src/memalloc.c
@@ -47,10 +47,9 @@
* Like malloc, but returns an error when out of space.
*/

-pointer
-ckmalloc(size_t nbytes)
+void *ckmalloc(size_t nbytes)
{
- pointer p;
+ void *p;

p = malloc(nbytes);
if (p == NULL)
@@ -63,8 +62,7 @@ ckmalloc(size_t nbytes)
* Same for realloc.
*/

-pointer
-ckrealloc(pointer p, size_t nbytes)
+void *ckrealloc(void *p, size_t nbytes)
{
p = realloc(p, nbytes);
if (p == NULL)
@@ -110,8 +108,7 @@ char *stacknxt = stackbase.space;
size_t stacknleft = MINSIZE;
char *sstrend = stackbase.space + MINSIZE;

-pointer
-stalloc(size_t nbytes)
+void *stalloc(size_t nbytes)
{
char *p;
size_t aligned;
@@ -144,8 +141,7 @@ stalloc(size_t nbytes)
}

-void
-stunalloc(pointer p)
+void stunalloc(void *p)
{
#ifdef DEBUG
if (!p || (stacknxt < (char *)p) || ((char *)p < stackp->space)) {
@@ -221,7 +217,7 @@ static void growstackblock(size_t min)
sp = stackp;
prevstackp = sp->prev;
grosslen = newlen + sizeof(struct stack_block) - MINSIZE;
- sp = ckrealloc((pointer)sp, grosslen);
+ sp = ckrealloc(sp, grosslen);
sp->prev = prevstackp;
stackp = sp;
stacknxt = sp->space;
diff --git a/src/memalloc.h b/src/memalloc.h
index b9adf76..a7f7996 100644
--- a/src/memalloc.h
+++ b/src/memalloc.h
@@ -48,11 +48,11 @@ extern char *stacknxt;
extern size_t stacknleft;
extern char *sstrend;

-pointer ckmalloc(size_t);
-pointer ckrealloc(pointer, size_t);
+void *ckmalloc(size_t);
+void *ckrealloc(void *, size_t);
char *savestr(const char *);
-pointer stalloc(size_t);
-void stunalloc(pointer);
+void *stalloc(size_t);
+void stunalloc(void *);
void pushstackmark(struct stackmark *mark, size_t len);
void setstackmark(struct stackmark *);
void popstackmark(struct stackmark *);
@@ -98,4 +98,4 @@ static inline char *_STPUTC(int c, char *p) {
#define ungrabstackstr(s, p) stunalloc((s))
#define stackstrend() ((void *)sstrend)

-#define ckfree(p) free((pointer)(p))
+#define ckfree(p) free((void *)(p))
--
2.39.2