X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.h;h=060d65403bc5b0294010b582032eb5ed8ab10d49;hb=4ce5b6570ed83ef2ab5296f369f147593507286b;hp=10251ae7c10b734bd906a644e0832e29b9e6bd9c;hpb=d31995b3074bb19aa4da66ce5c4774ca9ed101a1;p=paraslash.git diff --git a/string.h b/string.h index 10251ae7..060d6540 100644 --- a/string.h +++ b/string.h @@ -67,24 +67,24 @@ int for_each_line(unsigned flags, char *buf, size_t size, } \ ) -__must_check __malloc 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 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 *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); __printf_2_3 unsigned xasprintf(char **result, const char *fmt, ...); __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...); __must_check __malloc char *para_strcat(char *a, const char *b); -__must_check __malloc char *para_dirname(const char *name); -__must_check char *para_basename(const char *name); __must_check __malloc char *para_logname(void); __must_check __malloc char *para_homedir(void); __malloc char *para_hostname(void); __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...); int para_atoi64(const char *str, int64_t *result); int para_atoi32(const char *str, int32_t *value); -int get_loglevel_by_name(const char *txt); 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);