[asterisk-commits] russell: branch russell/ast_channel_ao2 r183639 - /team/russell/ast_channel_a...

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Mar 21 12:25:47 2009
New Revision: 183639

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183639
Log:
Don't allocate the channel name with one value and then immediately set to something else

Modified:
    team/russell/ast_channel_ao2/channels/chan_unistim.c

Modified: team/russell/ast_channel_ao2/channels/chan_unistim.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/channels/chan_unistim.c?view=diff&rev=183639&r1=183638&r2=183639
==============================================================================
--- team/russell/ast_channel_ao2/channels/chan_unistim.c (original)
+++ team/russell/ast_channel_ao2/channels/chan_unistim.c Sat Mar 21 12:25:47 2009
@@ -4435,8 +4435,8 @@
 		return NULL;
 	}
 	l = sub->parent;
-	tmp = ast_channel_alloc(1, state, l->cid_num, NULL, l->accountcode, l->exten, 
-		l->context, l->amaflags, "%s-%08x", l->fullname, (int) (long) sub);
+	tmp = ast_channel_alloc(1, state, l->cid_num, NULL, l->accountcode, l->exten,
+		l->context, l->amaflags, "%s@%s-%d", l->name, l->parent->name, sub->subtype);
 	if (unistimdebug)
 		ast_verb(0, "unistim_new sub=%d (%p) chan=%p\n", sub->subtype, sub, tmp);
 	if (!tmp) {
@@ -4451,8 +4451,6 @@
 	if (unistimdebug)
 		ast_verb(0, "Best codec = %d from nativeformats %d (line cap=%d global=%d)\n", fmt,
 			 tmp->nativeformats, l->capability, CAPABILITY);
-	ast_string_field_build(tmp, name, "USTM/%s@%s-%d", l->name, l->parent->name,
-						   sub->subtype);
 	if ((sub->rtp) && (sub->subtype == 0)) {
 		if (unistimdebug)
 			ast_verb(0, "New unistim channel with a previous rtp handle ?\n");