version 1.9, 2012/05/14 12:49:21
|
version 1.9.6.1, 2012/05/23 11:49:35
|
Line 57 io_arrayInit(int numItems)
|
Line 57 io_arrayInit(int numItems)
|
{ |
{ |
array_t *arr = NULL; |
array_t *arr = NULL; |
|
|
arr = malloc(sizeof(array_t)); | arr = xmalloc(sizeof(array_t)); |
if (!arr) { |
if (!arr) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 65 io_arrayInit(int numItems)
|
Line 65 io_arrayInit(int numItems)
|
|
|
arr->arr_last = -1; |
arr->arr_last = -1; |
arr->arr_num = numItems; |
arr->arr_num = numItems; |
arr->arr_data = calloc(io_arraySize(arr), sizeof(void*)); | arr->arr_data = xcalloc(io_arraySize(arr), sizeof(void*)); |
if (!arr->arr_data) { |
if (!arr->arr_data) { |
LOGERR; |
LOGERR; |
free(arr); | xfree(arr); |
return NULL; |
return NULL; |
} else |
} else |
io_arrayZero(arr); |
io_arrayZero(arr); |
Line 99 io_arrayFrom(const char *** __restrict pargv, int argc
|
Line 99 io_arrayFrom(const char *** __restrict pargv, int argc
|
else |
else |
for (a = *pargv; *a; a++, num++); |
for (a = *pargv; *a; a++, num++); |
|
|
arr = malloc(sizeof(array_t)); | arr = xmalloc(sizeof(array_t)); |
if (!arr) { |
if (!arr) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
} |
} |
|
|
arr->arr_num = num; |
arr->arr_num = num; |
arr->arr_data = calloc(io_arraySize(arr), sizeof(void*)); | arr->arr_data = xcalloc(io_arraySize(arr), sizeof(void*)); |
if (!arr->arr_data) { |
if (!arr->arr_data) { |
LOGERR; |
LOGERR; |
free(arr); | xfree(arr); |
return NULL; |
return NULL; |
} else { |
} else { |
memcpy(arr->arr_data, *pargv, io_arraySize(arr) * sizeof(void*)); |
memcpy(arr->arr_data, *pargv, io_arraySize(arr) * sizeof(void*)); |
Line 134 io_arrayTo(array_t * __restrict arr)
|
Line 134 io_arrayTo(array_t * __restrict arr)
|
if (!arr || !io_arraySize(arr)) |
if (!arr || !io_arraySize(arr)) |
return NULL; |
return NULL; |
|
|
args = (char **) calloc(io_arraySize(arr) + 1, sizeof(char*)); | args = (char **) xcalloc(io_arraySize(arr) + 1, sizeof(char*)); |
if (!args) { |
if (!args) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 162 io_arrayFree(array_t * __restrict arr)
|
Line 162 io_arrayFree(array_t * __restrict arr)
|
|
|
for (i = 0; i < io_arraySize(arr); i++) |
for (i = 0; i < io_arraySize(arr); i++) |
if (arr->arr_data[i]) { |
if (arr->arr_data[i]) { |
free(arr->arr_data[i]); | xfree(arr->arr_data[i]); |
arr->arr_data[i] = NULL; |
arr->arr_data[i] = NULL; |
} |
} |
|
|
Line 182 io_arrayDestroy(array_t ** __restrict parr)
|
Line 182 io_arrayDestroy(array_t ** __restrict parr)
|
return; |
return; |
|
|
if ((*parr)->arr_data) |
if ((*parr)->arr_data) |
free((*parr)->arr_data); | xfree((*parr)->arr_data); |
free(*parr); | xfree(*parr); |
*parr = NULL; |
*parr = NULL; |
} |
} |
|
|
Line 232 io_arrayGrow(array_t * __restrict arr, int newNumItems
|
Line 232 io_arrayGrow(array_t * __restrict arr, int newNumItems
|
} else if (freeShrink) |
} else if (freeShrink) |
for (i = newNumItems; i < arr->arr_num; i++) |
for (i = newNumItems; i < arr->arr_num; i++) |
if (arr->arr_data[i]) |
if (arr->arr_data[i]) |
free(arr->arr_data[i]); | xfree(arr->arr_data[i]); |
|
|
arr->arr_num = newNumItems; |
arr->arr_num = newNumItems; |
if (io_arraySize(arr)) { |
if (io_arraySize(arr)) { |
data = realloc(arr->arr_data, io_arraySize(arr) * sizeof(void*)); | data = xrealloc(arr->arr_data, io_arraySize(arr) * sizeof(void*)); |
if (!data) { |
if (!data) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 247 io_arrayGrow(array_t * __restrict arr, int newNumItems
|
Line 247 io_arrayGrow(array_t * __restrict arr, int newNumItems
|
arr->arr_last = io_arrayLen(arr); |
arr->arr_last = io_arrayLen(arr); |
} else { |
} else { |
if (arr->arr_data) |
if (arr->arr_data) |
free(arr->arr_data); | xfree(arr->arr_data); |
arr->arr_data = NULL; |
arr->arr_data = NULL; |
arr->arr_last = -1; |
arr->arr_last = -1; |
} |
} |
Line 549 io_MakeAV(const char * __restrict csArgs, const char *
|
Line 549 io_MakeAV(const char * __restrict csArgs, const char *
|
return -1; |
return -1; |
else |
else |
memset(psValue, 0, valLen); |
memset(psValue, 0, valLen); |
psBuf = strdup(csArgs); | psBuf = xstrdup(csArgs); |
if (!psBuf) { |
if (!psBuf) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 567 io_MakeAV(const char * __restrict csArgs, const char *
|
Line 567 io_MakeAV(const char * __restrict csArgs, const char *
|
strlcpy(psValue, pos, valLen); |
strlcpy(psValue, pos, valLen); |
} |
} |
|
|
free(psBuf); | xfree(psBuf); |
return ret; |
return ret; |
} |
} |
|
|