X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.h;h=060d65403bc5b0294010b582032eb5ed8ab10d49;hb=HEAD;hp=79ccb67eacf6c4604223f92a120c72b3f698ea52;hpb=58ba5f61771636a39077478e290a130457f1a4df;p=paraslash.git diff --git a/string.h b/string.h index 79ccb67e..d773600f 100644 --- a/string.h +++ b/string.h @@ -67,17 +67,18 @@ 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); __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); @@ -87,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);