[asterisk-commits] kpfleming: branch 1.4 r49536 - in /branches/1.4: channels/ main/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jan  4 15:58:42 2007
New Revision: 49536

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49536
Log:
don't mark these allocations as 'cache' allocations when caching has been disabled

Modified:
    branches/1.4/channels/iax2-parser.c
    branches/1.4/main/frame.c

Modified: branches/1.4/channels/iax2-parser.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/iax2-parser.c?view=diff&rev=49536&r1=49535&r2=49536
==============================================================================
--- branches/1.4/channels/iax2-parser.c (original)
+++ branches/1.4/channels/iax2-parser.c Thu Jan  4 15:58:42 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: branches/1.4/main/frame.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/frame.c?view=diff&rev=49536&r1=49535&r2=49536
==============================================================================
--- branches/1.4/main/frame.c (original)
+++ branches/1.4/main/frame.c Thu Jan  4 15:58:42 2007
@@ -300,10 +300,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