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

@@ -47,15 +47,9 @@ struct ast_datastore *__ast_datastore_alloc(const struct ast_datastore_info *inf
return NULL;
}
#if defined(__AST_DEBUG_MALLOC)
if (!(datastore = __ast_calloc(1, sizeof(*datastore), file, line, function))) {
return NULL;
}
#else
if (!(datastore = ast_calloc(1, sizeof(*datastore)))) {
return NULL;
}
#endif
datastore->info = info;