summaryrefslogtreecommitdiff
path: root/main/frame.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-12-27 18:33:44 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-12-27 18:33:44 +0000
commitd68c7c8ce646fe75ec0ebead66f52871ada4444f (patch)
treedfeb14f90a471988d68d943500c6f035660efe8a /main/frame.c
parent29ed493b40ad6c027a83888882d0689bc9079ecc (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: https://origsvn.digium.com/svn/asterisk/trunk@48989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/frame.c')
-rw-r--r--main/frame.c4
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;