diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-03-19 01:39:14 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-03-19 01:39:14 +0000 |
| commit | 45651441ec01f889f98094d8943e26db20b3fd01 (patch) | |
| tree | a9ad01ca57546de53f45ae621678001de1350927 /include | |
| parent | ce2d61cc62c6beee9fc83c9d809fc82c1b27feb1 (diff) | |
When astmm is in use, define ast_malloc and friends to malloc, etc., so that
it doesn't report that all allocations are coming from utils.h. Also, add some
more information to the error message astmm reports when a memory allocation
failure occurs.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13513 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/utils.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 416f362f6..c702fa6fb 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -246,6 +246,8 @@ int getloadavg(double *list, int nelem); long int ast_random(void); #endif +#ifndef __AST_DEBUG_MALLOC + /*! \brief A wrapper for malloc() @@ -383,6 +385,19 @@ char *_ast_strndup(const char *str, size_t len, const char *file, int lineno, co } ) +#else + +/* If astmm is in use, let it handle these. Otherwise, it will report that + all allocations are coming from this header file */ + +#define ast_malloc(a) malloc(a) +#define ast_calloc(a,b) calloc(a,b) +#define ast_realloc(a,b) realloc(a,b) +#define ast_strdup(a) strdup(a) +#define ast_strndup(a,b) strndup(a,b) + +#endif /* AST_DEBUG_MALLOC */ + #if !defined(ast_strdupa) && defined(__GNUC__) /*! \brief duplicate a string in memory from the stack |