X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=a0666d35bde5d038bb0df48c954618f1041af16a;hp=8bd34460877a389a40a85bccb67dfed49ead9871;hb=f732616f8be8b2c8b4137108faa25eeaccb77499;hpb=694171759afb90bfdc552676ff6d04697c93af00 diff --git a/string.c b/string.c index 8bd3446..a0666d3 100644 --- a/string.c +++ b/string.c @@ -25,7 +25,7 @@ * * \sa realloc(3). */ -__must_check __malloc void *para_realloc(void *p, size_t size) +__must_check __malloc void *adu_realloc(void *p, size_t size) { /* * No need to check for NULL pointers: If p is NULL, the call @@ -52,7 +52,7 @@ __must_check __malloc void *para_realloc(void *p, size_t size) * * \sa malloc(3). */ -__must_check __malloc void *para_malloc(size_t size) +__must_check __malloc void *adu_malloc(size_t size) { assert(size); void *p = malloc(size); @@ -77,9 +77,9 @@ __must_check __malloc void *para_malloc(size_t size) * * \sa calloc(3) */ -__must_check __malloc void *para_calloc(size_t size) +__must_check __malloc void *adu_calloc(size_t size) { - void *ret = para_malloc(size); + void *ret = adu_malloc(size); memset(ret, 0, size); return ret; @@ -98,7 +98,7 @@ __must_check __malloc void *para_calloc(size_t size) * * \sa strdup(3) */ -__must_check __malloc char *para_strdup(const char *s) +__must_check __malloc char *adu_strdup(const char *s) { char *ret; @@ -148,7 +148,7 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...) * * \sa strtol(3), atoi(3). */ -int para_atoi64(const char *str, int64_t *value) +__must_check int atoi64(const char *str, int64_t *result) { char *endptr; long long tmp; @@ -163,6 +163,6 @@ int para_atoi64(const char *str, int64_t *value) return -E_ATOI_NO_DIGITS; if (*endptr != '\0') /* Further characters after number */ return -E_ATOI_JUNK_AT_END; - *value = tmp; + *result = tmp; return 1; }