ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-30 08:03:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove __attribute__(returns_nonnull) from emalloc() et al

Browse Source 
Was added in error; in fact, emalloc() and its ilk can return NULL.
Also, Clang 3.5 and the Android GCC do not support this attribute.
This commit is contained in:
Andrew Bettison 2015-11-23 14:45:49 +10:30
parent fd38ddb892
commit 1d3a6abe61
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mem.h
View File

@ -38,20 +38,20 @@ void _serval_debug_free(void *p, struct __sourceloc whence);
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
void *_emalloc(struct __sourceloc, size_t bytes) __attribute__ ((malloc, alloc_size(2), returns_nonnull));
void *_emalloc(struct __sourceloc, size_t bytes) __attribute__ ((malloc, alloc_size(2)));
/* Equivalent to realloc(3), but logs an error before returning NULL.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
void *_erealloc(struct __sourceloc __whence, void *ptr, size_t bytes) __attribute__ ((alloc_size(3), returns_nonnull));
void *_erealloc(struct __sourceloc __whence, void *ptr, size_t bytes) __attribute__ ((alloc_size(3)));
/* Equivalent to malloc(3) followed by memset(3) to zerofill, but logs an error
* before returning NULL.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
void *_emalloc_zero(struct __sourceloc, size_t bytes) __attribute__ ((malloc, alloc_size(2), returns_nonnull));
void *_emalloc_zero(struct __sourceloc, size_t bytes) __attribute__ ((malloc, alloc_size(2)));
/* Equivalent to strdup(3)/strndup(3), but logs an error before returning NULL.
*
@ -60,8 +60,8 @@ void *_emalloc_zero(struct __sourceloc, size_t bytes) __attribute__ ((malloc, al
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
char *_str_edup(struct __sourceloc, const char *str) __attribute__ ((malloc, returns_nonnull));
char *_strn_edup(struct __sourceloc, const char *str, size_t len) __attribute__ ((malloc, returns_nonnull));
char *_str_edup(struct __sourceloc, const char *str) __attribute__ ((malloc));
char *_strn_edup(struct __sourceloc, const char *str, size_t len) __attribute__ ((malloc));
#define emalloc(bytes) _emalloc(__HERE__, (bytes))
#define erealloc(ptr, bytes) _erealloc(__HERE__, (ptr), (bytes))