[asterisk-commits] trunk r11314 - /trunk/channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: markster
Date: Mon Feb 27 22:32:04 2006
New Revision: 11314

URL: http://svn.digium.com/view/asterisk?rev=11314&view=rev
Log:
Fix for GCC 3.2.2

Modified:
    trunk/channels/chan_iax2.c

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=11314&r1=11313&r2=11314&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Feb 27 22:32:04 2006
@@ -4426,29 +4426,33 @@
 	ast_cli(fd, "IAX2 Thread Information\n");
 	time(&t);
 	ast_cli(fd, "Idle Threads:\n");
+#ifdef DEBUG_SCHED_MULTITHREAD
 	ASTOBJ_CONTAINER_TRAVERSE(&idlelist, 1, {
 		ast_cli(fd, "Thread %d: state=%d, update=%d, actions=%d, refcnt=%d, func ='%s'\n", 
-			iterator->threadnum, iterator->iostate, (int)(t - iterator->checktime), iterator->actions, iterator->refcount,
-#ifdef DEBUG_SCHED_MULTITHREAD
-		iterator->curfunc
-#else
-		""
-#endif
-		);
+			iterator->threadnum, iterator->iostate, (int)(t - iterator->checktime), iterator->actions, iterator->refcount, iterator->curfunc);
 		threadcount++;
 	});
-	ast_cli(fd, "Active Threads:\n");
-	ASTOBJ_CONTAINER_TRAVERSE(&activelist, 1, {
-		ast_cli(fd, "Thread %d: state=%d, update=%d, actions=%d, refcnt=%d, func ='%s'\n", 
-			iterator->threadnum, iterator->iostate, (int)(t - iterator->checktime), iterator->actions, iterator->refcount,
-#ifdef DEBUG_SCHED_MULTITHREAD
-		iterator->curfunc
 #else
-		""
-#endif
-			);
+	ASTOBJ_CONTAINER_TRAVERSE(&idlelist, 1, {
+		ast_cli(fd, "Thread %d: state=%d, update=%d, actions=%d, refcnt=%d\n", 
+			iterator->threadnum, iterator->iostate, (int)(t - iterator->checktime), iterator->actions, iterator->refcount);
 		threadcount++;
 	});
+#endif
+	ast_cli(fd, "Active Threads:\n");
+#ifdef DEBUG_SCHED_MULTITHREAD
+	ASTOBJ_CONTAINER_TRAVERSE(&idlelist, 1, {
+		ast_cli(fd, "Thread %d: state=%d, update=%d, actions=%d, refcnt=%d, func ='%s'\n", 
+			iterator->threadnum, iterator->iostate, (int)(t - iterator->checktime), iterator->actions, iterator->refcount, iterator->curfunc);
+		threadcount++;
+	});
+#else
+	ASTOBJ_CONTAINER_TRAVERSE(&idlelist, 1, {
+		ast_cli(fd, "Thread %d: state=%d, update=%d, actions=%d, refcnt=%d\n", 
+			iterator->threadnum, iterator->iostate, (int)(t - iterator->checktime), iterator->actions, iterator->refcount);
+		threadcount++;
+	});
+#endif
 	ast_cli(fd, "%d of %d threads accounted for\n", threadcount, iaxthreadcount);
 	return RESULT_SUCCESS;
 }