[asterisk-commits] russell: branch russell/ast_channel_ao2 r183804 - in /team/russell/ast_channe...

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Mar 23 14:35:55 2009
New Revision: 183804

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183804
Log:
resolve, reset

Modified:
    team/russell/ast_channel_ao2/   (props changed)
    team/russell/ast_channel_ao2/res/res_monitor.c

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 23 14:35:55 2009
@@ -1,1 +1,1 @@
-/trunk:1-183753
+/trunk:1-183803

Modified: team/russell/ast_channel_ao2/res/res_monitor.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/res/res_monitor.c?view=diff&rev=183804&r1=183803&r2=183804
==============================================================================
--- team/russell/ast_channel_ao2/res/res_monitor.c (original)
+++ team/russell/ast_channel_ao2/res/res_monitor.c Mon Mar 23 14:35:55 2009
@@ -588,16 +588,12 @@
 	ast_channel_lock(c);
 
 	if (ast_strlen_zero(fname)) {
-		/* No filename base specified, default to channel name as per CLI */		
-		if (!(fname = ast_strdup(c->name))) {
-			astman_send_error(s, m, "Could not start monitoring channel");
-			ast_channel_unlock(c);
-			c = ast_channel_unref(c);
-			return 0;
-		}
+		/* No filename base specified, default to channel name as per CLI */
+		fname = ast_strdupa(c->name);
 		/* Channels have the format technology/channel_name - have to replace that /  */
-		if ((d = strchr(fname, '/'))) 
+		if ((d = strchr(fname, '/'))) {
 			*d = '-';
+		}
 	}
 
 	if (ast_monitor_start(c, format, fname, 1, X_REC_IN | X_REC_OUT)) {