[asterisk-commits] trunk r16006 - in /trunk: channels/chan_iax2.c translate.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 28 22:09:31 2006
New Revision: 16006

URL: http://svn.digium.com/view/asterisk?rev=16006&view=rev
Log:
conversion from malloc to ast_malloc

Modified:
    trunk/channels/chan_iax2.c
    trunk/translate.c

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=16006&r1=16005&r2=16006&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Mar 28 22:09:31 2006
@@ -103,11 +103,11 @@
 
 /* Define SCHED_MULTITHREADED to run the scheduler in a special
    multithreaded mode. */
-#define SCHED_MULTITHREADED
+// #define SCHED_MULTITHREADED
 
 /* Define DEBUG_SCHED_MULTITHREADED to keep track of where each
    thread is actually doing. */
-#define DEBUG_SCHED_MULTITHREAD
+// #define DEBUG_SCHED_MULTITHREAD
 
 #ifdef NEWJB
 #include "../jitterbuf.h"

Modified: trunk/translate.c
URL: http://svn.digium.com/view/asterisk/trunk/translate.c?rev=16006&r1=16005&r2=16006&view=diff
==============================================================================
--- trunk/translate.c (original)
+++ trunk/translate.c Tue Mar 28 22:09:31 2006
@@ -110,7 +110,7 @@
 	source = powerof(source);
 	dest = powerof(dest);
 	
-	while(source != dest) {
+	while (source != dest) {
 		if (!tr_matrix[source][dest].step) {
 			/* We shouldn't have allocated any memory */
 			ast_log(LOG_WARNING, "No translator path from %s to %s\n", 
@@ -119,13 +119,12 @@
 		}
 
 		if (tmp) {
-			tmp->next = malloc(sizeof(*tmp));
+			tmp->next = ast_malloc(sizeof(*tmp));
 			tmp = tmp->next;
 		} else
-			tmp = malloc(sizeof(*tmp));
+			tmp = ast_malloc(sizeof(*tmp));
 			
 		if (!tmp) {
-			ast_log(LOG_WARNING, "Out of memory\n");
 			if (tmpr)
 				ast_translator_free_path(tmpr);	
 			return NULL;