<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16540] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16540">16540</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-29 20:55:49 -0600 (Fri, 29 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>try this wasim</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (16539 => 16540)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2010-01-29 22:03:37 UTC (rev 16539)
+++ freeswitch/trunk/src/switch_channel.c 2010-01-30 02:55:49 UTC (rev 16540)
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data);
</span><span class="cx">
</span><del>-SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_printf(switch_channel_t *channel, const char *varname, const char *fmt, ...)
</del><ins>+SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_printf(switch_channel_t *channel, const char *varname, const char *fmt, ...)
</ins><span class="cx"> {
</span><span class="cx"> int ret = 0;
</span><span class="cx"> char *data;
</span><span class="lines">@@ -763,10 +763,39 @@
</span><span class="cx"> return SWITCH_STATUS_MEMERR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_event_base_add_header(channel->variables, SWITCH_STACK_BOTTOM, varname, data);
</del><ins>+ status = switch_channel_set_variable(channel, varname, data);
+ free(data);
+ }
+ switch_mutex_unlock(channel->profile_mutex);
+
+ return status;
+}
</ins><span class="cx">
</span><del>- status = SWITCH_STATUS_SUCCESS;
</del><ins>+
+SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_name_printf(switch_channel_t *channel, const char *val, const char *fmt, ...)
+{
+ int ret = 0;
+ char *varname;
+ va_list ap;
+ switch_status_t status = SWITCH_STATUS_FALSE;
+
+ switch_assert(channel != NULL);
+
+ switch_mutex_lock(channel->profile_mutex);
+
+ va_start(ap, fmt);
+ ret = switch_vasprintf(&varname, fmt, ap);
+ va_end(ap);
+
+ if (ret == -1) {
+ switch_mutex_unlock(channel->profile_mutex);
+ return SWITCH_STATUS_MEMERR;
</ins><span class="cx"> }
</span><ins>+
+ status = switch_channel_set_variable(channel, varname, val);
+
+ free(varname);
+
</ins><span class="cx"> switch_mutex_unlock(channel->profile_mutex);
</span><span class="cx">
</span><span class="cx"> return status;
</span><span class="lines">@@ -863,7 +892,7 @@
</span><span class="cx"> state = switch_channel_get_running_state(other_channel);
</span><span class="cx"> mystate = switch_channel_get_running_state(channel);
</span><span class="cx">
</span><del>- if (mystate != ostate || state >= CS_HANGUP || state >= want_state) {
</del><ins>+ if (mystate != ostate || state >= CS_HANGUP || mystate == want_state) {
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> switch_cond_next();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>