diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 21:59:06 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 21:59:06 +0000 |
| commit | 779a16372f32b2475bd715ba8f81d6a00d757938 (patch) | |
| tree | 861829d65e7736d0a2f24bb39c069f20bca84239 | |
| parent | a3df7ad6e7a7008d491c6d831368b5b16f8bf088 (diff) | |
Merged revisions 49536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49536 | kpfleming | 2007-01-04 15:58:42 -0600 (Thu, 04 Jan 2007) | 2 lines
don't mark these allocations as 'cache' allocations when caching has been disabled
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49538 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/iax2-parser.c | 8 | ||||
| -rw-r--r-- | main/frame.c | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index 1cb37d1ac..1a5f4d9f8 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; diff --git a/main/frame.c b/main/frame.c index f8935db5c..39ba8cdad 100644 --- a/main/frame.c +++ b/main/frame.c @@ -304,10 +304,12 @@ static struct ast_frame *ast_frame_header_new(void) return f; } } -#endif - if (!(f = ast_calloc_cache(1, sizeof(*f)))) return NULL; +#else + if (!(f = ast_calloc(1, sizeof(*f)))) + return NULL; +#endif f->mallocd_hdr_len = sizeof(*f); #ifdef TRACE_FRAMES |