diff options
| author | Corey Farrell <git@cfware.com> | 2016-08-19 15:09:45 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-08-19 20:16:36 -0400 |
| commit | 8061d9f66f636ada714f719be9809ea58cd5c871 (patch) | |
| tree | 09bb8e63ebce00f7023ef54008a75af1caa50b61 /main/stringfields.c | |
| parent | c6ed91a9c89de71b44045a53cfc73e1b12744cf8 (diff) | |
Fix naming mismatch of allocator functions.
Allocator functions that take file/line/func parameters are prefixed
with single-underscore when MALLOC_DEBUG is not defined,
double-underscore when it is defined. This change updates all
allocators that accept file/line/func to have the same prototype in
either ABI mode. The parameter order of __ast_vasprintf and
__ast_asprintf in utils.h have been changed to match that of astmm.h.
End-use allocator macro's have been removed from astmm.h and moved to an
unconditional part of utils.h.
Change-Id: I823bb6ce2b5675b3a4735948f10a3b420e9a023a
Diffstat (limited to 'main/stringfields.c')
| -rw-r--r-- | main/stringfields.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/stringfields.c b/main/stringfields.c index e82b49b98..25c584462 100644 --- a/main/stringfields.c +++ b/main/stringfields.c @@ -60,11 +60,7 @@ static size_t optimal_alloc_size(size_t size) static void *calloc_wrapper(unsigned int num_structs, size_t struct_size, const char *file, int lineno, const char *func) { -#if defined(__AST_DEBUG_MALLOC) return __ast_calloc(num_structs, struct_size, file, lineno, func); -#else - return ast_calloc(num_structs, struct_size); -#endif } /*! \brief add a new block to the pool. |