Merge topic branch t/overflow into master

[paraslash.git] / string.h

diff --git a/string.h b/string.h
index 84b6f787924f18a805eea6b5d2730a4ffa230159..060d65403bc5b0294010b582032eb5ed8ab10d49 100644 (file)
--- 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);