Merge "core: Remove ABI effects of MALLOC_DEBUG."

This commit is contained in:
Jenkins2
2018-03-13 13:54:19 -05:00
committed by Gerrit Code Review
29 changed files with 390 additions and 485 deletions

View File

@@ -2322,28 +2322,6 @@ int ast_parse_digest(const char *digest, struct ast_http_digest *d, int request,
return 0;
}
#ifndef __AST_DEBUG_MALLOC
int __ast_asprintf(const char *file, int lineno, const char *func, char **ret, const char *fmt, ...)
{
int res;
va_list ap;
va_start(ap, fmt);
res = vasprintf(ret, fmt, ap);
if (res < 0) {
/*
* *ret is undefined so set to NULL to ensure it is
* initialized to something useful.
*/
*ret = NULL;
MALLOC_FAILURE_MSG;
}
va_end(ap);
return res;
}
#endif
int ast_get_tid(void)
{
int ret = -1;