<!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][14193] </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=14193">14193</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:54:04 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mon Jun 29 07:52:27 CDT 2009 kai.k.samposalo@nokia.com
* Symbian winscw build fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuahttphttp_parserc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuamsgmsg_mimec">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuamsgmsg_parserc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuamsgmsg_parser_utilc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantantac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanthnth_clientc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanthnth_serverc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_clientc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_event_serverc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_notifierc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_paramsc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_serverc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_stackc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_subnotrefc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuaoutboundc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasipsip_basicc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasipsip_parserc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasipsip_pref_utilc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_pref_util.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasoasoac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasoasoa_staticc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasresolvsres_sipc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasusu_allocc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuatporttportc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuatporttport_type_tcpc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuaurlsofiasipurlh">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuaurlurlc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssofiasipupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/.update (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:50:55 CDT 2009
</del><ins>+Thu Jul 9 19:52:17 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuahttphttp_parserc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_parser.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -332,7 +332,8 @@
</span><span class="cx"> for (n = l1; IS_LWS(s[n]); n++)
</span><span class="cx"> s[n] = '\0';
</span><span class="cx"> if (s[n] == '/') {
</span><del>- for (n = n + 1; IS_LWS(s[n]); n++);
</del><ins>+ for (n = n + 1; IS_LWS(s[n]); n++)
+ {}
</ins><span class="cx"> l2 = span_token(s + n);
</span><span class="cx"> n += l2;
</span><span class="cx"> }
</span><span class="lines">@@ -492,7 +493,7 @@
</span><span class="cx"> *ss = (s + n);
</span><span class="cx"> if (nname) *nname = name;
</span><span class="cx">
</span><del>- return code;
</del><ins>+ return (http_method_t)code;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Get method enum corresponding to method name */
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuamsgmsg_mimec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -984,9 +984,11 @@
</span><span class="cx"> /* Media type consists of two tokens, separated by / */
</span><span class="cx">
</span><span class="cx"> l1 = span_token(s);
</span><del>- for (n = l1; IS_LWS(s[n]); n++);
</del><ins>+ for (n = l1; IS_LWS(s[n]); n++)
+ {}
</ins><span class="cx"> if (s[n] == '/') {
</span><del>- for (n++; IS_LWS(s[n]); n++);
</del><ins>+ for (n++; IS_LWS(s[n]); n++)
+ {}
</ins><span class="cx"> l2 = span_token(s + n);
</span><span class="cx"> n += l2;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuamsgmsg_parserc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (mo->msg_flags & MSG_FLG_TRAILERS)
</span><del>- msg_set_streaming(msg, 0);
</del><ins>+ msg_set_streaming(msg, (enum msg_streaming_status)0);
</ins><span class="cx">
</span><span class="cx"> if (msg->m_buffer->mb_used + msg->m_buffer->mb_commit ==
</span><span class="cx"> msg->m_buffer->mb_size)
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuamsgmsg_parser_utilc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx">
</span><span class="cx"> if (n == N) {
</span><span class="cx"> /* Reallocate params */
</span><del>- char const **nparams = su_realloc(home, params != stack ? params : NULL,
</del><ins>+ char const **nparams = su_realloc(home, (void*)(params != stack ? params : NULL),
</ins><span class="cx"> (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params));
</span><span class="cx"> if (!nparams) {
</span><span class="cx"> goto error;
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> }
</span><span class="cx"> else if (n == N) {
</span><span class="cx"> /* Reallocate params */
</span><del>- char const **nparams = su_realloc(home, params != stack ? params : NULL,
</del><ins>+ char const **nparams = su_realloc(home, (void*)(params != stack ? params : NULL),
</ins><span class="cx"> (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params));
</span><span class="cx"> if (!nparams) {
</span><span class="cx"> goto error;
</span><span class="lines">@@ -1553,7 +1553,8 @@
</span><span class="cx"> if (s == NULL)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- for (M = 0; s[M]; M++);
</del><ins>+ for (M = 0; s[M]; M++)
+ {}
</ins><span class="cx">
</span><span class="cx"> if (M == 0)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1570,7 +1571,8 @@
</span><span class="cx"> dd = (msg_param_t **)((char *)dst + dst->h_class->hc_params);
</span><span class="cx"> d = *dd;
</span><span class="cx">
</span><del>- for (N = 0; d && d[N]; N++);
</del><ins>+ for (N = 0; d && d[N]; N++)
+ {}
</ins><span class="cx">
</span><span class="cx"> for (m = 0, M = 0, total = 0; s[m]; m++) {
</span><span class="cx"> t = s[m];
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantantac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -3155,7 +3155,7 @@
</span><span class="cx"> url->url_port = lv->v_port;
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><del>- if (su_strmatch(url->url_port, url_port_default(url->url_type)) ||
</del><ins>+ if (su_strmatch(url->url_port, url_port_default((enum url_type_e)url->url_type)) ||
</ins><span class="cx"> su_strmatch(url->url_port, ""))
</span><span class="cx"> /* Remove default or empty port */
</span><span class="cx"> url->url_port = NULL;
</span><span class="lines">@@ -11745,7 +11745,7 @@
</span><span class="cx"> {
</span><span class="cx"> tport_t *tp;
</span><span class="cx">
</span><del>- assert(orq); (void)tp;
</del><ins>+ assert(orq);
</ins><span class="cx">
</span><span class="cx"> #if HAVE_SOFIA_STUN
</span><span class="cx"> return tport_keepalive(orq->orq_tport, msg_addrinfo(orq->orq_request),
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanthnth_clientc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -608,13 +608,13 @@
</span><span class="cx"> if (!h || !url)
</span><span class="cx"> return -1;
</span><span class="cx">
</span><del>- tpn->tpn_proto = url_tport_default(url->url_type);
</del><ins>+ tpn->tpn_proto = url_tport_default((enum url_type_e)url->url_type);
</ins><span class="cx"> tpn->tpn_canon = h->h_host;
</span><span class="cx"> tpn->tpn_host = h->h_host;
</span><span class="cx"> if (h->h_port)
</span><span class="cx"> tpn->tpn_port = h->h_port;
</span><span class="cx"> else
</span><del>- tpn->tpn_port = url_port_default(url->url_type);
</del><ins>+ tpn->tpn_port = url_port_default((enum url_type_e)url->url_type);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1189,7 +1189,7 @@
</span><span class="cx">
</span><span class="cx"> if (streaming && !hc->hc_streaming) {
</span><span class="cx"> /* Disable streaming for this msg */
</span><del>- msg_set_streaming(msg, 0);
</del><ins>+ msg_set_streaming(msg, (enum msg_streaming_status)0);
</ins><span class="cx">
</span><span class="cx"> return 0; /* Wait for complete message */
</span><span class="cx"> }
</span><span class="lines">@@ -1204,7 +1204,7 @@
</span><span class="cx"> shutdown = 2;
</span><span class="cx">
</span><span class="cx"> if (!streaming || shutdown)
</span><del>- msg_set_streaming(msg, 0);
</del><ins>+ msg_set_streaming(msg, (enum msg_streaming_status)0);
</ins><span class="cx">
</span><span class="cx"> if (hc->hc_pending) {
</span><span class="cx"> tport_release(hc->hc_tport, hc->hc_pending, hc->hc_request, msg, hc,
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanthnth_serverc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx">
</span><span class="cx"> if (parent->site_path) {
</span><span class="cx"> /* subpath */
</span><del>- url_init(url0, parent->site_url->url_type);
</del><ins>+ url_init(url0, (enum url_type_e)parent->site_url->url_type);
</ins><span class="cx"> url0->url_path = s;
</span><span class="cx"> address = (url_string_t*)url0;
</span><span class="cx"> }
</span><span class="lines">@@ -291,13 +291,13 @@
</span><span class="cx"> /* absolute URL with scheme */;
</span><span class="cx"> else if (s[sep] == '\0' && strchr(s, '.') && host_is_valid(s)) {
</span><span class="cx"> /* looks like a domain name */;
</span><del>- url_init(url0, parent->site_url->url_type);
</del><ins>+ url_init(url0, (enum url_type_e)parent->site_url->url_type);
</ins><span class="cx"> url0->url_host = s;
</span><span class="cx"> address = (url_string_t*)url0;
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> /* looks like a path */
</span><del>- url_init(url0, parent->site_url->url_type);
</del><ins>+ url_init(url0, (enum url_type_e)parent->site_url->url_type);
</ins><span class="cx"> url0->url_path = s;
</span><span class="cx"> address = (url_string_t*)url0;
</span><span class="cx"> }
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- tpn->tpn_proto = url_tport_default(url->url_type);
</del><ins>+ tpn->tpn_proto = url_tport_default((enum url_type_e)url->url_type);
</ins><span class="cx"> tpn->tpn_canon = url->url_host;
</span><span class="cx"> tpn->tpn_host = url->url_host;
</span><span class="cx"> tpn->tpn_port = url_port(url);
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx">
</span><span class="cx"> /* Disable streaming */
</span><span class="cx"> if (msg_is_streaming(request)) {
</span><del>- msg_set_streaming(request, 0);
</del><ins>+ msg_set_streaming(request, (enum msg_streaming_status)0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> else {
</span><span class="cx"> tp_name_t const *tpn = tport_name(tport); assert(tpn);
</span><span class="cx"> loc->loc_url->url_host = tpn->tpn_canon;
</span><del>- if (strcmp(url_port_default(loc->loc_url->url_type), tpn->tpn_port))
</del><ins>+ if (strcmp(url_port_default((enum url_type_e)loc->loc_url->url_type), tpn->tpn_port))
</ins><span class="cx"> loc->loc_url->url_port = tpn->tpn_port;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_clientc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> if (!cr) {
</span><span class="cx"> return nua_stack_event(nh->nh_nua, nh,
</span><span class="cx"> NULL,
</span><del>- event,
</del><ins>+ (enum nua_event_e)event,
</ins><span class="cx"> NUA_ERROR_AT(__FILE__, __LINE__),
</span><span class="cx"> NULL);
</span><span class="cx"> }
</span><span class="lines">@@ -1245,7 +1245,7 @@
</span><span class="cx"> int can_redirect(sip_contact_t const *m, sip_method_t method)
</span><span class="cx"> {
</span><span class="cx"> if (m && m->m_url->url_host) {
</span><del>- enum url_type_e type = m->m_url->url_type;
</del><ins>+ enum url_type_e type = (enum url_type_e)m->m_url->url_type;
</ins><span class="cx"> return
</span><span class="cx"> type == url_sip ||
</span><span class="cx"> type == url_sips ||
</span><span class="lines">@@ -1546,7 +1546,7 @@
</span><span class="cx">
</span><span class="cx"> nua_stack_event(nh->nh_nua, nh,
</span><span class="cx"> nta_outgoing_getresponse(orq),
</span><del>- cr->cr_event,
</del><ins>+ (enum nua_event_e)cr->cr_event,
</ins><span class="cx"> status, phrase,
</span><span class="cx"> tags);
</span><span class="cx"> return 1;
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_event_serverc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SU_DEBUG_7(("nua(%p): authorize_watcher: %s\n", (void *)nh, what));
</span><del>- nea_sub_auth(sn->sn_subscriber, substate,
</del><ins>+ nea_sub_auth(sn->sn_subscriber, (nea_state_t)substate,
</ins><span class="cx"> TAG_IF(substate == nua_substate_pending,
</span><span class="cx"> NEATAG_FAKE(1)),
</span><span class="cx"> TAG_IF(substate == nua_substate_terminated,
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> TAG_END());
</span><span class="cx">
</span><span class="cx"> if (sub && state > 0) {
</span><del>- nea_sub_auth(sub, state, TAG_NEXT(tags));
</del><ins>+ nea_sub_auth(sub, (nea_state_t)state, TAG_NEXT(tags));
</ins><span class="cx"> nua_stack_event(nua, nh, NULL, e, SIP_200_OK, NULL);
</span><span class="cx"> }
</span><span class="cx"> else {
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_notifierc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -764,7 +764,7 @@
</span><span class="cx">
</span><span class="cx"> nua_stack_tevent(nh->nh_nua, nh,
</span><span class="cx"> nta_outgoing_getresponse(orq),
</span><del>- cr->cr_event,
</del><ins>+ (enum nua_event_e)cr->cr_event,
</ins><span class="cx"> status, phrase,
</span><span class="cx"> NUTAG_SUBSTATE(substate),
</span><span class="cx"> SIPTAG_EVENT(du ? du->du_event : NULL),
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_paramsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -762,7 +762,7 @@
</span><span class="cx"> else if (refresher <= nua_no_refresher)
</span><span class="cx"> refresher = nua_no_refresher;
</span><span class="cx">
</span><del>- NHP_SET(nhp, refresher, refresher);
</del><ins>+ NHP_SET(nhp, refresher, (enum nua_session_refresher)refresher);
</ins><span class="cx"> }
</span><span class="cx"> /* NUTAG_UPDATE_REFRESH(update_refresh) */
</span><span class="cx"> else if (tag == nutag_update_refresh) {
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_serverc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_server.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> }
</span><span class="cx"> else if (status < 300 && !sr->sr_event) {
</span><span class="cx"> msg_t *msg = msg_ref_create(sr->sr_request.msg);
</span><del>- nua_event_t e = sr->sr_methods->sm_event;
</del><ins>+ nua_event_t e = (enum nua_event_e)sr->sr_methods->sm_event;
</ins><span class="cx"> sr->sr_event = 1;
</span><span class="cx"> nua_stack_event(nua, nh, msg, e, status, phrase, tags);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_stackc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> }
</span><span class="cx"> else if (!nh->nh_valid) { /* Handle has been destroyed */
</span><span class="cx"> if (nua_log->log_level >= 7) {
</span><del>- char const *name = nua_event_name(e->e_event) + 4;
</del><ins>+ char const *name = nua_event_name((enum nua_event_e)e->e_event) + 4;
</ins><span class="cx"> SU_DEBUG_7(("nua(%p): event %s dropped\n", (void *)nh, name));
</span><span class="cx"> }
</span><span class="cx"> nua_handle_unref(nh);
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> su_msg_save(frame->nf_saved, sumsg);
</span><span class="cx"> frame->nf_next = nua->nua_current, nua->nua_current = frame;
</span><span class="cx">
</span><del>- nua->nua_callback(e->e_event, e->e_status, e->e_phrase,
</del><ins>+ nua->nua_callback((enum nua_event_e)e->e_event, e->e_status, e->e_phrase,
</ins><span class="cx"> nua, nua->nua_magic,
</span><span class="cx"> nh, nh ? nh->nh_magic : NULL,
</span><span class="cx"> e->e_msg ? sip_object(e->e_msg) : NULL,
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (nua_log->log_level >= 5) {
</span><del>- char const *name = nua_event_name(e->e_event);
</del><ins>+ char const *name = nua_event_name((enum nua_event_e)e->e_event);
</ins><span class="cx">
</span><span class="cx"> if (e->e_status == 0)
</span><span class="cx"> SU_DEBUG_5(("nua(%p): %s signal %s\n", (void *)nh, "recv", name + 4));
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx">
</span><span class="cx"> su_msg_save(nua->nua_signal, msg);
</span><span class="cx">
</span><del>- event = e->e_event;
</del><ins>+ event = (enum nua_event_e)e->e_event;
</ins><span class="cx">
</span><span class="cx"> if (nua->nua_shutdown && !e->e_always) {
</span><span class="cx"> /* Shutting down */
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx"> void nua_stack_destroy_handle(nua_t *nua, nua_handle_t *nh, tagi_t const *tags)
</span><span class="cx"> {
</span><span class="cx"> if (nh->nh_notifier)
</span><del>- nua_stack_terminate(nua, nh, 0, NULL);
</del><ins>+ nua_stack_terminate(nua, nh, (enum nua_event_e)0, NULL);
</ins><span class="cx">
</span><span class="cx"> nua_dialog_shutdown(nh, nh->nh_ds);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_subnotrefc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx"> if (!error) {
</span><span class="cx"> /* Give application an Event header for matching NOTIFYs with REFER */
</span><span class="cx"> nua_stack_tevent(nh->nh_nua, nh, NULL,
</span><del>- cr->cr_event, SIP_100_TRYING,
</del><ins>+ (enum nua_event_e)cr->cr_event, SIP_100_TRYING,
</ins><span class="cx"> NUTAG_REFER_EVENT(event),
</span><span class="cx"> SIPTAG_EVENT(event),
</span><span class="cx"> TAG_END());
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuaoutboundc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx"> else if (sip_has_feature(sip->sip_unsupported, tag))
</span><span class="cx"> return outbound_feature_unsupported;
</span><span class="cx"> else
</span><del>- return level;
</del><ins>+ return (enum outbound_feature)level;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasipsip_basicc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -1287,7 +1287,7 @@
</span><span class="cx"> sip_cseq_t *cs;
</span><span class="cx">
</span><span class="cx"> if (method)
</span><del>- method_name = sip_method_name(method, method_name);
</del><ins>+ method_name = sip_method_name((sip_method_t)method, method_name);
</ins><span class="cx">
</span><span class="cx"> if (method_name == NULL)
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -1298,7 +1298,7 @@
</span><span class="cx">
</span><span class="cx"> if (cs) {
</span><span class="cx"> cs->cs_seq = seq;
</span><del>- cs->cs_method = method;
</del><ins>+ cs->cs_method = (sip_method_t)method;
</ins><span class="cx"> if (!method)
</span><span class="cx"> method_name = strcpy((char *)(cs + 1), method_name);
</span><span class="cx"> cs->cs_method_name = method_name;
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasipsip_parserc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -244,9 +244,11 @@
</span><span class="cx"> result = s;
</span><span class="cx">
</span><span class="cx"> l1 = span_token(s);
</span><del>- for (n = l1; IS_LWS(s[n]); n++);
</del><ins>+ for (n = l1; IS_LWS(s[n]); n++)
+ {}
</ins><span class="cx"> if (s[n] == '/') {
</span><del>- for (n++; IS_LWS(s[n]); n++);
</del><ins>+ for (n++; IS_LWS(s[n]); n++)
+ {}
</ins><span class="cx"> l2 = span_token(s + n);
</span><span class="cx"> n += l2;
</span><span class="cx"> }
</span><span class="lines">@@ -436,7 +438,7 @@
</span><span class="cx"> *ss = (s + n);
</span><span class="cx"> if (return_name) *return_name = name;
</span><span class="cx">
</span><del>- return code;
</del><ins>+ return (sip_method_t)code;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Get method enum corresponding to method name */
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasipsip_pref_utilc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_pref_util.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_pref_util.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_pref_util.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -86,7 +86,8 @@
</span><span class="cx"> *in_out_s = s + strlen(s);
</span><span class="cx"> return 1;
</span><span class="cx"> } else if (s[0] == '"' && s[1] != '\0') {
</span><del>- for (s++; IS_LWS(s[0]); s++);
</del><ins>+ for (s++; IS_LWS(s[0]); s++)
+ {}
</ins><span class="cx"> } else
</span><span class="cx"> old_type = sp_error;
</span><span class="cx"> } else if (!s[0]) {
</span><span class="lines">@@ -98,14 +99,16 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if ((*return_negation = s[0] == '!'))
</span><del>- for (s++; IS_LWS(s[0]); s++);
</del><ins>+ for (s++; IS_LWS(s[0]); s++)
+ {}
</ins><span class="cx">
</span><span class="cx"> if (*s == '#') {
</span><span class="cx"> /* Numeric */
</span><span class="cx"> double n1, n2;
</span><span class="cx"> char s0, *e;
</span><span class="cx">
</span><del>- for (s++; IS_LWS(s[0]); s++);
</del><ins>+ for (s++; IS_LWS(s[0]); s++)
+ {}
</ins><span class="cx">
</span><span class="cx"> s0 = s[0];
</span><span class="cx">
</span><span class="lines">@@ -143,10 +146,12 @@
</span><span class="cx"> s += n;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (; IS_LWS(s[0]); s++);
</del><ins>+ for (; IS_LWS(s[0]); s++)
+ {}
</ins><span class="cx">
</span><span class="cx"> if (s[0] == ',' || (s[0] == '"' && s[1] == '\0'))
</span><del>- for (s++; IS_LWS(s[0]); s++);
</del><ins>+ for (s++; IS_LWS(s[0]); s++)
+ {}
</ins><span class="cx"> else
</span><span class="cx"> old_type = sp_error;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasoasoac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> || srtp_integrity != (int)ss->ss_srtp_integrity
</span><span class="cx"> ;
</span><span class="cx">
</span><del>- ss->ss_af = af;
</del><ins>+ ss->ss_af = (enum soa_af)af;
</ins><span class="cx">
</span><span class="cx"> ss->ss_rtp_select = rtp_select;
</span><span class="cx"> ss->ss_rtp_sort = rtp_sort;
</span><span class="lines">@@ -2300,7 +2300,7 @@
</span><span class="cx">
</span><span class="cx"> if (c->c_nettype != sdp_net_in ||
</span><span class="cx"> (c->c_addrtype != sdp_addr_ip4 && c->c_addrtype != sdp_addr_ip6)) {
</span><del>- c->c_nettype = sdp_net_in, c->c_addrtype = 0;
</del><ins>+ c->c_nettype = sdp_net_in, c->c_addrtype = (sdp_addrtype_e)0;
</ins><span class="cx"> c->c_address = strcpy(buffer, "");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2323,7 +2323,7 @@
</span><span class="cx">
</span><span class="cx"> if (ip4 && ip6) {
</span><span class="cx"> /* Prefer address family already used in session, if any */
</span><del>- sdp_addrtype_e addrtype = 0;
</del><ins>+ sdp_addrtype_e addrtype = (sdp_addrtype_e)0;
</ins><span class="cx"> char const *because = "error";
</span><span class="cx">
</span><span class="cx"> if (sdp && sdp->sdp_connection &&
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasoasoa_staticc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -725,9 +725,9 @@
</span><span class="cx"> if (session == NULL || user == NULL)
</span><span class="cx"> return (errno = EFAULT), -1;
</span><span class="cx">
</span><del>- Ns = sdp_media_count(session, sdp_media_any, 0, 0, 0);
- Nu = sdp_media_count(user, sdp_media_any, 0, 0, 0);
- Nr = sdp_media_count(remote, sdp_media_any, 0, 0, 0);
</del><ins>+ Ns = sdp_media_count(session, sdp_media_any, (sdp_text_t)0, (sdp_proto_e)0, (sdp_text_t)0);
+ Nu = sdp_media_count(user, sdp_media_any, (sdp_text_t)0, (sdp_proto_e)0, (sdp_text_t)0);
+ Nr = sdp_media_count(remote, sdp_media_any, (sdp_text_t)0, (sdp_proto_e)0, (sdp_text_t)0);
</ins><span class="cx">
</span><span class="cx"> if (remote == NULL)
</span><span class="cx"> Nmax = Ns + Nu;
</span><span class="lines">@@ -1044,29 +1044,29 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- send_mode = um->m_mode & sdp_sendonly;
</del><ins>+ send_mode = (sdp_mode_t)(um->m_mode & sdp_sendonly);
</ins><span class="cx"> if (rm)
</span><span class="cx"> send_mode = (rm->m_mode & sdp_recvonly) ? sdp_sendonly : 0;
</span><span class="cx">
</span><del>- recv_mode = um->m_mode & sdp_recvonly;
</del><ins>+ recv_mode = (sdp_mode_t)(um->m_mode & sdp_recvonly);
</ins><span class="cx">
</span><span class="cx"> if (rm && rm->m_mode == sdp_inactive) {
</span><del>- send_mode = recv_mode = 0;
</del><ins>+ send_mode = recv_mode = (sdp_mode_t)0;
</ins><span class="cx"> }
</span><span class="cx"> else if (inactive_all) {
</span><del>- send_mode = recv_mode = 0;
</del><ins>+ send_mode = recv_mode = (sdp_mode_t)0;
</ins><span class="cx"> }
</span><span class="cx"> else if (hold_all) {
</span><del>- recv_mode = 0;
</del><ins>+ recv_mode = (sdp_mode_t)0;
</ins><span class="cx"> }
</span><span class="cx"> else if (hold && (hold_media = su_strcasestr(hold, sm->m_type_name))) {
</span><del>- recv_mode = 0;
</del><ins>+ recv_mode = (sdp_mode_t)0;
</ins><span class="cx"> hold_media += strlen(sm->m_type_name);
</span><span class="cx"> hold_media += strspn(hold_media, " \t");
</span><span class="cx"> if (hold_media[0] == '=') {
</span><span class="cx"> hold_media += strspn(hold, " \t");
</span><span class="cx"> if (su_casenmatch(hold_media, "inactive", strlen("inactive")))
</span><del>- recv_mode = send_mode = 0;
</del><ins>+ recv_mode = send_mode = (sdp_mode_t)0;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1140,8 +1140,8 @@
</span><span class="cx"> if (local && remote) switch (action) {
</span><span class="cx"> case generate_answer:
</span><span class="cx"> case process_answer:
</span><del>- if (sdp_media_count(remote, sdp_media_any, "*", 0, 0) <
- sdp_media_count(local, sdp_media_any, "*", 0, 0)) {
</del><ins>+ if (sdp_media_count(remote, sdp_media_any, "*", (sdp_proto_e)0, (sdp_text_t)0) <
+ sdp_media_count(local, sdp_media_any, "*", (sdp_proto_e)0, (sdp_text_t)0)) {
</ins><span class="cx"> SU_DEBUG_5(("%s: remote %s is truncated: expanding\n",
</span><span class="cx"> by, action == generate_answer ? "offer" : "answer"));
</span><span class="cx"> remote = soa_sdp_expand_media(tmphome, remote, local);
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasresolvsres_sipc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> if (numeric) {
</span><span class="cx"> naptr = 0, srv = 0;
</span><span class="cx"> if (!port || !strlen(port))
</span><del>- port = url_port_default(u->url_type);
</del><ins>+ port = url_port_default((enum url_type_e)u->url_type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* RFC 3263:
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasusu_allocc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx">
</span><span class="cx"> if (parent) {
</span><span class="cx"> su_block_t *sub = MEMLOCK(parent);
</span><del>- home = sub_alloc(parent, sub, size, 2);
</del><ins>+ home = sub_alloc(parent, sub, size, (enum sub_zero)2);
</ins><span class="cx"> UNLOCK(parent);
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> void *data;
</span><span class="cx">
</span><span class="cx"> if (home) {
</span><del>- data = sub_alloc(home, MEMLOCK(home), size, 0);
</del><ins>+ data = sub_alloc(home, MEMLOCK(home), size, (enum sub_zero)0);
</ins><span class="cx"> UNLOCK(home);
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="lines">@@ -1304,7 +1304,7 @@
</span><span class="cx">
</span><span class="cx"> sub = MEMLOCK(home);
</span><span class="cx"> if (!data) {
</span><del>- data = sub_alloc(home, sub, size, 0);
</del><ins>+ data = sub_alloc(home, sub, size, (enum sub_zero)0);
</ins><span class="cx"> UNLOCK(home);
</span><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="lines">@@ -1468,7 +1468,7 @@
</span><span class="cx"> assert (size >= 0);
</span><span class="cx">
</span><span class="cx"> if (home) {
</span><del>- data = sub_alloc(home, MEMLOCK(home), size, 1);
</del><ins>+ data = sub_alloc(home, MEMLOCK(home), size, (enum sub_zero)1);
</ins><span class="cx"> UNLOCK(home);
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="lines">@@ -1518,7 +1518,7 @@
</span><span class="cx"> return (void)(errno = ENOMEM), NULL;
</span><span class="cx">
</span><span class="cx"> if (home) {
</span><del>- retval = sub_alloc(home, MEMLOCK(home), size, 1);
</del><ins>+ retval = sub_alloc(home, MEMLOCK(home), size, (enum sub_zero)1);
</ins><span class="cx"> UNLOCK(home);
</span><span class="cx"> }
</span><span class="cx"> else
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuatporttportc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -1513,9 +1513,9 @@
</span><span class="cx"> server = 0;
</span><span class="cx">
</span><span class="cx"> if (server)
</span><del>- retval = tport_bind_server(mr, mytpn, transports, public, ta_args(ta));
</del><ins>+ retval = tport_bind_server(mr, mytpn, transports, (enum tport_via)public, ta_args(ta));
</ins><span class="cx"> else
</span><del>- retval = tport_bind_client(mr, mytpn, transports, public, ta_args(ta));
</del><ins>+ retval = tport_bind_client(mr, mytpn, transports, (enum tport_via)public, ta_args(ta));
</ins><span class="cx">
</span><span class="cx"> ta_end(ta);
</span><span class="cx">
</span><span class="lines">@@ -4678,7 +4678,7 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- tpn->tpn_proto = url_tport_default(url->url_type);
</del><ins>+ tpn->tpn_proto = url_tport_default((enum url_type_e)url->url_type);
</ins><span class="cx"> tpn->tpn_canon = url->url_host;
</span><span class="cx"> tpn->tpn_host = url->url_host;
</span><span class="cx"> tpn->tpn_port = url_port(url);
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuatporttport_type_tcpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> if (self->tp_msg &&
</span><span class="cx"> su_time_cmp(su_time_add(self->tp_rtime, timeout), now) < 0) {
</span><span class="cx"> msg_t *msg = self->tp_msg;
</span><del>- msg_set_streaming(msg, 0);
</del><ins>+ msg_set_streaming(msg, (enum msg_streaming_status)0);
</ins><span class="cx"> msg_set_flags(msg, MSG_FLG_ERROR | MSG_FLG_TRUNC | MSG_FLG_TIMEOUT);
</span><span class="cx"> tport_deliver(self, msg, NULL, NULL, now);
</span><span class="cx"> self->tp_msg = NULL;
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuaurlsofiasipurlh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> /** Return the URL port string, using default port if none present. */
</span><span class="cx"> #define URL_PORT(u) \
</span><span class="cx"> ((u) && (u)->url_port ? (u)->url_port : \
</span><del>- url_port_default((u) ? (u)->url_type : url_any))
</del><ins>+ url_port_default((u) ? (enum url_type_e)(u)->url_type : url_any))
</ins><span class="cx">
</span><span class="cx"> /* ---------------------------------------------------------------------- */
</span><span class="cx"> /* url_string_t handling */
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuaurlurlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c 2009-07-10 00:52:38 UTC (rev 14192)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c 2009-07-10 00:54:04 UTC (rev 14193)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> memset(url, 0, sizeof(*url));
</span><span class="cx"> url->url_type = type;
</span><span class="cx"> if (type > url_unknown) {
</span><del>- char const *scheme = url_scheme(url->url_type);
</del><ins>+ char const *scheme = url_scheme((enum url_type_e)url->url_type);
</ins><span class="cx"> if (scheme)
</span><span class="cx"> url->url_scheme = scheme;
</span><span class="cx"> }
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx">
</span><span class="cx"> url->url_type = url_get_type(url->url_scheme, n);
</span><span class="cx">
</span><del>- have_authority = !url_type_is_opaque(url->url_type);
</del><ins>+ have_authority = !url_type_is_opaque((enum url_type_e)url->url_type);
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> url->url_type = url_unknown;
</span><span class="lines">@@ -1135,7 +1135,7 @@
</span><span class="cx"> srcp = &src->url_scheme;
</span><span class="cx">
</span><span class="cx"> if (dst->url_type > url_unknown)
</span><del>- *dstp = url_scheme(dst->url_type);
</del><ins>+ *dstp = url_scheme((enum url_type_e)dst->url_type);
</ins><span class="cx">
</span><span class="cx"> if (*dstp != NULL)
</span><span class="cx"> dstp++, srcp++; /* Skip scheme if it is constant */
</span><span class="lines">@@ -1591,9 +1591,9 @@
</span><span class="cx"> char const *b_port;
</span><span class="cx">
</span><span class="cx"> if (url_type != url_sip && url_type != url_sips)
</span><del>- a_port = b_port = url_port_default(url_type);
</del><ins>+ a_port = b_port = url_port_default((enum url_type_e)url_type);
</ins><span class="cx"> else if (host_is_ip_address(a->url_host))
</span><del>- a_port = b_port = url_port_default(url_type);
</del><ins>+ a_port = b_port = url_port_default((enum url_type_e)url_type);
</ins><span class="cx"> else
</span><span class="cx"> a_port = b_port = "";
</span><span class="cx">
</span><span class="lines">@@ -1702,9 +1702,9 @@
</span><span class="cx"> char const *b_port;
</span><span class="cx">
</span><span class="cx"> if (url_type != url_sip && url_type != url_sips)
</span><del>- a_port = b_port = url_port_default(url_type);
</del><ins>+ a_port = b_port = url_port_default((enum url_type_e)url_type);
</ins><span class="cx"> else if (host_is_ip_address(a->url_host))
</span><del>- a_port = b_port = url_port_default(url_type);
</del><ins>+ a_port = b_port = url_port_default((enum url_type_e)url_type);
</ins><span class="cx"> else
</span><span class="cx"> a_port = b_port = "";
</span><span class="cx">
</span><span class="lines">@@ -1863,7 +1863,7 @@
</span><span class="cx"> if (!host_is_ip_address(u->url_host))
</span><span class="cx"> return "";
</span><span class="cx">
</span><del>- return url_port_default(u->url_type);
</del><ins>+ return url_port_default((enum url_type_e)u->url_type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Sanitize URL.
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>