diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-27 18:33:44 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-27 18:33:44 +0000 |
commit | c66dcd0bc56e785551ad1e3528e57d50479b9eff (patch) | |
tree | dfeb14f90a471988d68d943500c6f035660efe8a /main/frame.c | |
parent | 51d97b494e1ea76ade15f88a6395fe44edb0b48c (diff) |
Merged revisions 48987 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48987 | kpfleming | 2006-12-27 12:29:13 -0600 (Wed, 27 Dec 2006) | 2 lines
allow 'show memory' and 'show memory summary' to distinguish memory allocations that were done for caching purposes, so they don't look like memory leaks
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48989 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/frame.c')
-rw-r--r-- | main/frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/frame.c b/main/frame.c index 0e46dcdca..16b4ae6e1 100644 --- a/main/frame.c +++ b/main/frame.c @@ -301,7 +301,7 @@ static struct ast_frame *ast_frame_header_new(void) } } - if (!(f = ast_calloc(1, sizeof(*f)))) + if (!(f = ast_calloc_cache(1, sizeof(*f)))) return NULL; f->mallocd_hdr_len = sizeof(*f); @@ -458,7 +458,7 @@ struct ast_frame *ast_frdup(const struct ast_frame *f) AST_LIST_TRAVERSE_SAFE_END } if (!buf) { - if (!(buf = ast_calloc(1, len))) + if (!(buf = ast_calloc_cache(1, len))) return NULL; out = buf; out->mallocd_hdr_len = len; |