Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions sys/include/ape/xalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ extern void *x2nrealloc(void *, size_t *, size_t); /* growing: ~1.5x */
extern void *x2realloc(void *, size_t *);
extern void *xpalloc(void *, ptrdiff_t *, ptrdiff_t, ptrdiff_t, ptrdiff_t);

/* idx_t (ptrdiff_t) signed-size variants */
extern void *ximalloc(ptrdiff_t);
extern void *xirealloc(void *, ptrdiff_t);
extern void *xicalloc(ptrdiff_t, ptrdiff_t);
extern void *xizalloc(ptrdiff_t);
extern void *ximemdup(void const *, ptrdiff_t);
extern char *ximemdup0(void const *, ptrdiff_t);

/* Convenience: typed versions */
#define XMALLOC(t, n) ((t *)xmalloc((n) * sizeof(t)))
#define XCALLOC(t, n) ((t *)xcalloc((n), sizeof(t)))
Expand Down
40 changes: 40 additions & 0 deletions sys/src/ape/lib/ap/malloc/xmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,43 @@ xpalloc(void *pa, ptrdiff_t *pn, ptrdiff_t n_incr_min, ptrdiff_t n_max, ptrdiff_
*pn = n;
return pa;
}

/* idx_t (ptrdiff_t) variants — same semantics, signed-size argument. */

void *
ximalloc(ptrdiff_t s)
{
return xmalloc((size_t)s);
}

void *
xirealloc(void *p, ptrdiff_t s)
{
return xrealloc(p, (size_t)s);
}

void *
xicalloc(ptrdiff_t n, ptrdiff_t s)
{
return xcalloc((size_t)n, (size_t)s);
}

void *
xizalloc(ptrdiff_t s)
{
return xicalloc(s, 1);
}

void *
ximemdup(void const *p, ptrdiff_t s)
{
return xmemdup(p, (size_t)s);
}

char *
ximemdup0(void const *p, ptrdiff_t s)
{
char *result = ximalloc(s + 1);
result[s] = '\0';
return memcpy(result, p, s);
}
Loading