X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=10251ae7c10b734bd906a644e0832e29b9e6bd9c;hp=84b6f787924f18a805eea6b5d2730a4ffa230159;hb=refs%2Fheads%2Fnext;hpb=5967ac5353739c3ff571dd12d4c6814fa8493ad8 diff --git a/string.h b/string.h index 84b6f787..d773600f 100644 --- a/string.h +++ b/string.h @@ -67,9 +67,12 @@ int for_each_line(unsigned flags, char *buf, size_t size, } \ ) +__must_check void *arr_realloc(void *ptr, size_t nmemb, size_t size); __must_check void *para_realloc(void *p, size_t size); -__must_check __malloc void *para_malloc(size_t size); -__must_check __malloc void *para_calloc(size_t size); +__must_check __malloc void *alloc(size_t size); +__must_check __malloc void *zalloc(size_t size); +__must_check __malloc void *arr_alloc(size_t nmemb, size_t size); +__must_check __malloc void *arr_zalloc(size_t nmemb, size_t size); __must_check __malloc char *para_strdup(const char *s); __printf_2_0 unsigned xvasprintf(char **result, const char *fmt, va_list ap); @@ -85,7 +88,6 @@ int para_atoi32(const char *str, int32_t *value); int read_size_header(const char *buf); int create_argv(const char *buf, const char *delim, char ***result); int create_shifted_argv(const char *buf, const char *delim, char ***result); -int find_arg(const char *arg, char **argv); void free_argv(char **argv); int para_regcomp(regex_t *preg, const char *regex, int cflags); void freep(void *arg);