[asterisk-commits] mmichelson: trunk r185777 - /trunk/main/manager.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr  1 08:59:34 2009
New Revision: 185777

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=185777
Log:
Address Russell's comments regarding rev 185704.

Use ast_debug and ast_softhangup_nolock.


Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/manager.c?view=diff&rev=185777&r1=185776&r2=185777
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Apr  1 08:59:34 2009
@@ -1787,13 +1787,11 @@
 		return 0;
 	}
 	if (causecode > 0) {
-		if (option_debug >= 1) {
-			ast_log(LOG_DEBUG, "Setting hangupcause of channel %s to %d (is %d now)\n",
+		ast_debug(1, "Setting hangupcause of channel %s to %d (is %d now)\n",
 				c->name, causecode, c->hangupcause);
-		}
 		c->hangupcause = causecode;
 	}
-	ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);
+	ast_softhangup_nolock(c, AST_SOFTHANGUP_EXPLICIT);
 	ast_channel_unlock(c);
 	astman_send_ack(s, m, "Channel Hungup");
 	return 0;