#endif
}
-void *xmalloc(size_t nelems)
+void *mdvi_malloc(size_t nelems)
{
void *ptr = malloc(nelems);
return ptr;
}
-void *xrealloc(void *data, size_t newsize)
+void *mdvi_realloc(void *data, size_t newsize)
{
void *ptr;
return ptr;
}
-void *xcalloc(size_t nmemb, size_t size)
+void *mdvi_calloc(size_t nmemb, size_t size)
{
void *ptr;
return ptr;
}
-void xfree(void *ptr)
+void mdvi_free(void *ptr)
{
if(ptr == NULL)
crash(_("attempted to free NULL pointer\n"));
free(ptr);
}
-char *xstrdup(const char *string)
+char *mdvi_strdup(const char *string)
{
int length;
char *ptr;
length = strlen(string) + 1;
- ptr = (char *)xmalloc(length);
+ ptr = (char *)mdvi_malloc(length);
memcpy(ptr, string, length);
return ptr;
}
/* `to' should have room for length+1 bytes */
-char *xstrncpy(char *to, const char *from, size_t length)
+char *mdvi_strncpy(char *to, const char *from, size_t length)
{
strncpy(to, from, length);
to[length] = '\0';
return to;
}
-char *xstrndup(const char *string, size_t length)
+char *mdvi_strndup(const char *string, size_t length)
{
int n;
char *ptr;
n = strlen(string);
if(n > length)
n = length;
- ptr = (char *)xmalloc(n + 1);
+ ptr = (char *)mdvi_malloc(n + 1);
memcpy(ptr, string, n);
return ptr;
}
-void *xmemdup(const void *data, size_t length)
+void *mdvi_memdup(const void *data, size_t length)
{
- void *ptr = xmalloc(length);
+ void *ptr = mdvi_malloc(length);
memcpy(ptr, data, length);
return ptr;
if(m == 0)
m = strlen(src);
if(n + m >= *size) {
- dest = xrealloc(dest, n + m + 1);
+ dest = mdvi_realloc(dest, n + m + 1);
*size = n + m + 1;
}
memcpy(dest + n, src, m);
return dest;
}
-int get_number(const char *string, long *val)
-{
- long x;
- char *end;
-
- errno = 0;
- x = strtol(string, &end, 10);
- if(errno || *end)
- return -1;
- *val = x;
- return 0;
-}
-
char *getword(char *string, const char *delim, char **end)
{
char *ptr;
if(len) {
if(dstr->length + len >= dstr->size) {
dstr->size = pow2(dstr->length + len + 1);
- dstr->data = xrealloc(dstr->data, dstr->size);
+ dstr->data = mdvi_realloc(dstr->data, dstr->size);
}
memcpy(dstr->data + dstr->length, string, len);
dstr->length += len;
} else if(dstr->size == 0) {
ASSERT(dstr->data == NULL);
dstr->size = 8;
- dstr->data = xmalloc(8);
+ dstr->data = mdvi_malloc(8);
dstr->data[0] = 0;
}
if(len) {
if(dstr->length + len >= dstr->size) {
dstr->size = pow2(dstr->length + len + 1);
- dstr->data = xrealloc(dstr->data, dstr->size);
+ dstr->data = mdvi_realloc(dstr->data, dstr->size);
}
/* make room */
memmove(dstr->data + pos, dstr->data + pos + len, len);
len = strlen(string);
if(len) {
dstr->size = pow2(len + 1);
- dstr->data = xmalloc(dstr->size * len);
+ dstr->data = mdvi_malloc(dstr->size * len);
memcpy(dstr->data, string, len);
} else
dstring_init(dstr);
void dstring_reset(Dstring *dstr)
{
if(dstr->data)
- xfree(dstr->data);
+ mdvi_free(dstr->data);
dstring_init(dstr);
}