[asterisk-commits] kpfleming: trunk r49538 - in /trunk: ./ channels/iax2-parser.c main/frame.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jan  4 15:59:06 2007
New Revision: 49538

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49538
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/iax2-parser.c
    trunk/main/frame.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/iax2-parser.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/iax2-parser.c?view=diff&rev=49538&r1=49537&r2=49538
==============================================================================
--- trunk/channels/iax2-parser.c (original)
+++ trunk/channels/iax2-parser.c Thu Jan  4 15:59:06 2007
@@ -959,13 +959,17 @@
 		}
 		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;

Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=49538&r1=49537&r2=49538
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Thu Jan  4 15:59:06 2007
@@ -304,10 +304,12 @@
 			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