aboutsummaryrefslogtreecommitdiffstats
path: root/channels/iax2-parser.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-04 21:58:42 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-04 21:58:42 +0000
commit77961ba4ac46b261f2204c0d9f9ea56b4079d5eb (patch)
tree40f5e0bac6c71e286addd080d0cf9682db6d455d /channels/iax2-parser.c
parent7f40bb2d060a18cafc199a54ea1b8726ca4f55b0 (diff)
don't mark these allocations as 'cache' allocations when caching has been disabled
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@49536 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/iax2-parser.c')
-rw-r--r--channels/iax2-parser.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index 319d4caaa..35575c988 100644
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -959,13 +959,17 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab
}
AST_LIST_TRAVERSE_SAFE_END
}
-#endif
-
if (!fr) {
if (!(fr = ast_calloc_cache(1, sizeof(*fr) + datalen)))
return NULL;
fr->mallocd_datalen = datalen;
}
+#else
+ if (!(fr = ast_calloc(1, sizeof(*fr) + datalen)))
+ return NULL;
+ fr->mallocd_datalen = datalen;
+#endif
+
fr->direction = direction;
fr->retrans = -1;