From 8eedf5bdb05c2df0cd339f8742dc4f1752e8aaae Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sun, 5 Dec 2021 11:39:54 -0800 Subject: Chore: more explicit namespace for memory buffer --- src/base/mem/buffer.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/base/mem') diff --git a/src/base/mem/buffer.c b/src/base/mem/buffer.c index b684d35..448f41b 100644 --- a/src/base/mem/buffer.c +++ b/src/base/mem/buffer.c @@ -2,23 +2,23 @@ /* Grow to particular size */ void* -·bufgrow(void* buf, vlong newLen, vlong eltsize) +mem·bufgrow(void* buf, vlong newLen, vlong eltsize) { - assert(bufcap(buf) <= (SIZE_MAX - 1) / 2); + assert(mem·bufcap(buf) <= (SIZE_MAX - 1) / 2); - vlong newCap = MAX(16, MAX(1 + 2 * bufcap(buf), newLen)); + vlong newCap = MAX(16, MAX(1 + 2 * mem·bufcap(buf), newLen)); assert(newLen <= newCap); - assert(newCap <= (SIZE_MAX - offsetof(BufHdr, buf)) / eltsize); + assert(newCap <= (SIZE_MAX - offsetof(mem·BufHead, buf)) / eltsize); - vlong newSize = offsetof(BufHdr, buf) + newCap * eltsize; + vlong newSize = offsetof(mem·BufHead, buf) + newCap * eltsize; - BufHdr* newHdr; + mem·BufHead* newHdr; if (buf) { - newHdr = bufhdr(buf); - newHdr = (BufHdr*)realloc((void*)newHdr, newSize); + newHdr = mem·bufhdr(buf); + newHdr = (mem·BufHead*)realloc((void*)newHdr, newSize); } else { - newHdr = (BufHdr*)malloc(newSize); + newHdr = (mem·BufHead*)malloc(newSize); newHdr->len = 0; } @@ -27,8 +27,9 @@ void* } /* Pop out a value */ +#if 0 void -·bufdel(void *buf, int i, vlong eltsize) +mem·bufdel(void *buf, int i, vlong eltsize) { int n; byte *b; @@ -36,10 +37,11 @@ void assert(eltsize < sizeof(stk)); b = (byte*)buf; - if(n = buflen(buf), i < n) { + if(n = mem·buflen(buf), i < n) { memcpy(stk, b+eltsize*i, eltsize); memcpy(b+eltsize*i, b+eltsize*(i+1), eltsize*(n-i-1)); memcpy(b+eltsize*(n-1), stk, eltsize); } - bufhdr(buf)->len--; + mem·bufhdr(buf)->len--; } +#endif -- cgit v1.2.1