pnx/archived
Archived
1
0
Fork 0
Code Activity

xalloc

Browse source
This commit is contained in:
H Hautakoski 2010-09-18 19:01:33 +02:00 • committed by Henrik Hautakoski
parent 25d789c77b
commit 2c2c0781d9
6 changed files with 190 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/common/strbuf.c
View file

@ -10,31 +10,13 @@
#include <ctype.h>
#include <string.h>
#include <malloc.h>
#include <assert.h>
#include "xalloc.h"
#include "strbuf.h"
#define CHNK_SIZE 128
char strbuf_null = '\0';
static void* xrealloc(void *ptr, size_t size) {
assert(size);
ptr = realloc(ptr, size);
assert(ptr != NULL);
return ptr;
}
static void* xcalloc(size_t nmemb, size_t size) {
assert(nmemb);
assert(size);
void *ptr = calloc(nmemb, size);
assert(ptr != NULL);
return ptr;
}
void strbuf_init(strbuf_t *s) {
s->buf = &strbuf_null;
@ -69,7 +51,7 @@ char* strbuf_release(strbuf_t *s) {
char *ret;
if (!s->alloc_size)
ret = xcalloc(1, 1);
ret = xmallocz(1);
else if (s->len + 1 != s->alloc_size)
ret = xrealloc(s->buf, s->len + 1);
else
@ -85,7 +67,7 @@ void strbuf_free(strbuf_t *s) {
if (!s->alloc_size)
return;
free(s->buf);
xfree(s->buf);
strbuf_init(s);
}