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
This commit is contained in:
Corey Farrell
2016-08-19 15:09:45 -04:00
parent c6ed91a9c8
commit 8061d9f66f
9 changed files with 127 additions and 211 deletions

View File

@@ -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.