<!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][15893] </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=15893">15893</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-12-10 19:20:26 -0600 (Thu, 10 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> if space </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc">freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec">freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_curlmod_curlc">freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_exprexprevalc">freeswitch/trunk/src/mod/applications/mod_expr/expreval.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_exprexprinitc">freeswitch/trunk/src/mod/applications/mod_expr/exprinit.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_fifomod_fifoc">freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc">freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_memcachemod_memcachec">freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec">freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc">freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_dingalingmod_dingalingc">freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_iaxiaxc">freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_slac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_shoutmod_shoutc">freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_lualualoadlibc">freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c</a></li>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_rpcmod_xml_rpcc">freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_asrc">freeswitch/trunk/src/switch_core_asr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_speechc">freeswitch/trunk/src/switch_core_speech.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_mprintfc">freeswitch/trunk/src/switch_mprintf.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_natc">freeswitch/trunk/src/switch_nat.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) {
</span><span class="cx">
</span><del>- if(zstr(newvalue)) {
</del><ins>+ if (zstr(newvalue)) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No local database defined.\n");
</span><span class="cx"> } else {
</span><span class="cx"> switch_safe_free(globals.odbc_dsn);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -1876,7 +1876,7 @@
</span><span class="cx">
</span><span class="cx"> member->score_iir = (int)(((1.0 - SCORE_DECAY) * (float)member->score) + (SCORE_DECAY * (float)member->score_iir));
</span><span class="cx">
</span><del>- if(member->score_iir > SCORE_MAX_IIR) {
</del><ins>+ if (member->score_iir > SCORE_MAX_IIR) {
</ins><span class="cx"> member->score_iir = SCORE_MAX_IIR;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5197,11 +5197,11 @@
</span><span class="cx"> switch_channel_set_variable(channel, "conference_name", conference->name);
</span><span class="cx">
</span><span class="cx"> /* Set MOH from variable if not set */
</span><del>- if(zstr(conference->moh_sound)) {
</del><ins>+ if (zstr(conference->moh_sound)) {
</ins><span class="cx"> conference->moh_sound = switch_core_strdup(conference->pool, switch_channel_get_variable(channel, "conference_moh_sound"));
</span><span class="cx"> }
</span><span class="cx"> /* Set perpetual-sound from variable if not set */
</span><del>- if(zstr(conference->perpetual_sound)) {
</del><ins>+ if (zstr(conference->perpetual_sound)) {
</ins><span class="cx"> conference->perpetual_sound = switch_core_strdup(conference->pool, switch_channel_get_variable(channel, "conference_perpetual_sound"));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_curlmod_curlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(method, "head")) {
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_NOBODY, SWITCH_TRUE);
</span><del>- } else if(!strcasecmp(method, "post")) {
</del><ins>+ } else if (!strcasecmp(method, "post")) {
</ins><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDSIZE, strlen(data));
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, (void *) data);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Post data: %s\n", data);
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> switch_channel_set_variable(channel, "curl_response_data", print_json(pool, http_data));
</span><span class="cx"> } else {
</span><span class="cx"> SWITCH_STANDARD_STREAM(stream);
</span><del>- if(do_headers) {
</del><ins>+ if (do_headers) {
</ins><span class="cx"> slist = http_data->headers;
</span><span class="cx"> while(slist) {
</span><span class="cx"> stream.write_function(&stream, "%s\n", slist->data);
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> if (do_json) {
</span><span class="cx"> stream->write_function(stream, "%s", print_json(pool, http_data));
</span><span class="cx"> } else {
</span><del>- if(do_headers) {
</del><ins>+ if (do_headers) {
</ins><span class="cx"> slist = http_data->headers;
</span><span class="cx"> while(slist) {
</span><span class="cx"> stream->write_function(stream, "%s\n", slist->data);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_exprexprevalc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_expr/expreval.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_expr/expreval.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_expr/expreval.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -15,9 +15,9 @@
</span><span class="cx"> /* Defines for error checking */
</span><span class="cx"> #include <errno.h>
</span><span class="cx">
</span><del>-#if(EXPR_ERROR_LEVEL >= EXPR_ERROR_LEVEL_CHECK)
</del><ins>+#if (EXPR_ERROR_LEVEL >= EXPR_ERROR_LEVEL_CHECK)
</ins><span class="cx"> #define EXPR_RESET_ERR() errno = 0
</span><del>-#define EXPR_CHECK_ERR() if(errno) return EXPR_ERROR_OUTOFRANGE
</del><ins>+#define EXPR_CHECK_ERR() if (errno) return EXPR_ERROR_OUTOFRANGE
</ins><span class="cx"> #else
</span><span class="cx"> #define EXPR_RESET_ERR()
</span><span class="cx"> #define EXPR_CHECK_ERR()
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> if (d2 != 0.0)
</span><span class="cx"> *val = d1 / d2;
</span><span class="cx"> else {
</span><del>-#if(EXPR_ERROR_LEVEL >= EXPR_ERROR_LEVEL_CHECK)
</del><ins>+#if (EXPR_ERROR_LEVEL >= EXPR_ERROR_LEVEL_CHECK)
</ins><span class="cx"> return EXPR_ERROR_DIVBYZERO;
</span><span class="cx"> #else
</span><span class="cx"> *val = 0.0;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_exprexprinitc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_expr/exprinit.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_expr/exprinit.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_expr/exprinit.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> /* Macro for adding a function node type */
</span><span class="cx"> #define EXPR_ADDFUNC_TYPE(name, type, argmin, argmax, refmin, refmax) \
</span><span class="cx"> err = exprFuncListAddType(flist, name, type, argmin, argmax, refmin, refmax); \
</span><del>-if(err != EXPR_ERROR_NOERROR) \
</del><ins>+if (err != EXPR_ERROR_NOERROR) \
</ins><span class="cx"> return err;
</span><span class="cx">
</span><span class="cx"> /* Macro for adding a constant */
</span><span class="cx"> #define EXPR_ADDCONST(name, val) \
</span><span class="cx"> err = exprValListAdd(vlist, name, val); \
</span><del>-if(err != EXPR_ERROR_NOERROR) \
</del><ins>+if (err != EXPR_ERROR_NOERROR) \
</ins><span class="cx"> return err;
</span><span class="cx">
</span><span class="cx"> /* Call this function to initialize these functions into a function list */
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_fifomod_fifoc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -878,7 +878,7 @@
</span><span class="cx"> node_list[node_count++] = node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(switch_true(switch_channel_get_variable(channel, "fifo_destroy_after_use"))) {
</del><ins>+ if (switch_true(switch_channel_get_variable(channel, "fifo_destroy_after_use"))) {
</ins><span class="cx"> node->ready = FIFO_DELAY_DESTROY;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -199,18 +199,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* if a session is provided, check if the source part of the regex has any channel variables, then expand them */
</span><del>- if(session) {
</del><ins>+ if (session) {
</ins><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_assert(channel);
</span><span class="cx">
</span><del>- if(switch_string_var_check_const(src) || switch_string_has_escaped_data(src)) {
</del><ins>+ if (switch_string_var_check_const(src) || switch_string_has_escaped_data(src)) {
</ins><span class="cx"> tmp_regex = switch_channel_expand_variables(channel, src);
</span><span class="cx"> src_regex = switch_core_strdup(pool, tmp_regex);
</span><span class="cx"> switch_safe_free(tmp_regex);
</span><span class="cx"> src = src_regex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(switch_string_var_check_const(dst) || switch_string_has_escaped_data(dst)) {
</del><ins>+ if (switch_string_var_check_const(dst) || switch_string_has_escaped_data(dst)) {
</ins><span class="cx"> tmp_regex = switch_channel_expand_variables(channel, dst);
</span><span class="cx"> dst_regex = switch_core_strdup(pool, tmp_regex);
</span><span class="cx"> switch_safe_free(tmp_regex);
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> db_random = "rand()";
</span><span class="cx"> return SWITCH_TRUE;
</span><span class="cx"> }
</span><del>- if(db_check("SELECT random();") == SWITCH_TRUE) {
</del><ins>+ if (db_check("SELECT random();") == SWITCH_TRUE) {
</ins><span class="cx"> db_random = "random()";
</span><span class="cx"> return SWITCH_TRUE;
</span><span class="cx"> }
</span><span class="lines">@@ -1354,9 +1354,9 @@
</span><span class="cx"> if (!strcasecmp(argv[i], "intrastate")) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
</span><span class="cx"> cb_struct.intrastate = SWITCH_TRUE;
</span><del>- } else if(!strcasecmp(argv[i], "as")) {
</del><ins>+ } else if (!strcasecmp(argv[i], "as")) {
</ins><span class="cx"> i++;
</span><del>- if(argv[i] && !strcasecmp(argv[i], "xml")) {
</del><ins>+ if (argv[i] && !strcasecmp(argv[i], "xml")) {
</ins><span class="cx"> as_xml = SWITCH_TRUE;
</span><span class="cx"> } else {
</span><span class="cx"> goto usage;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_memcachemod_memcachec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -183,11 +183,11 @@
</span><span class="cx"> key = argv[1];
</span><span class="cx"> val = argv[2];
</span><span class="cx">
</span><del>- if(argc > 3) {
</del><ins>+ if (argc > 3) {
</ins><span class="cx"> expires_str = argv[3];
</span><span class="cx"> expires = (time_t)strtol(expires_str, NULL, 10);
</span><span class="cx"> }
</span><del>- if(argc > 4) {
</del><ins>+ if (argc > 4) {
</ins><span class="cx"> flags_str = argv[4];
</span><span class="cx"> flags = (uint32_t)strtol(flags_str, NULL, 16);
</span><span class="cx"> }
</span><span class="lines">@@ -239,11 +239,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> svalue = "1";
</span><span class="cx"> }
</span><del>- if(argc > 3) {
</del><ins>+ if (argc > 3) {
</ins><span class="cx"> expires_str = argv[3];
</span><span class="cx"> expires = (time_t)strtol(expires_str, NULL, 10);
</span><span class="cx"> }
</span><del>- if(argc > 4) {
</del><ins>+ if (argc > 4) {
</ins><span class="cx"> flags_str = argv[4];
</span><span class="cx"> flags = (uint32_t)strtol(flags_str, NULL, 16);
</span><span class="cx"> }
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(subcmd, "delete") && argc > 1) {
</span><span class="cx"> key = argv[1];
</span><del>- if(argc > 2) {
</del><ins>+ if (argc > 2) {
</ins><span class="cx"> expires_str = argv[3];
</span><span class="cx"> expires = (time_t)strtol(expires_str, NULL, 10);
</span><span class="cx"> }
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, mcache_error);
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(subcmd, "flush")) {
</span><del>- if(argc > 1) {
</del><ins>+ if (argc > 1) {
</ins><span class="cx"> expires_str = argv[3];
</span><span class="cx"> expires = (time_t)strtol(expires_str, NULL, 10);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx"> *datalen = my_datalen * 2;
</span><del>- if(datalen == 0) {
</del><ins>+ if (datalen == 0) {
</ins><span class="cx"> return SWITCH_STATUS_BREAK;
</span><span class="cx"> } else {
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx">
</span><span class="cx"> done:
</span><span class="cx">
</span><del>- if(status != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (status != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> audio_queue_destroy(laudio_queue);
</span><span class="cx"> }
</span><span class="cx"> return status;
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx">
</span><span class="cx"> #ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
</span><span class="cx"> switch_size_t len = *data_len;
</span><del>- if(queue->file_write) {
</del><ins>+ if (queue->file_write) {
</ins><span class="cx"> switch_file_write(queue->file_write, data, &len);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -3275,7 +3275,7 @@
</span><span class="cx"> */
</span><span class="cx"> static char *ip_addr_get(const char *value, apr_pool_t *pool)
</span><span class="cx"> {
</span><del>- if(!value || strcasecmp(value,"auto") == 0) {
</del><ins>+ if (!value || strcasecmp(value,"auto") == 0) {
</ins><span class="cx"> char *addr = DEFAULT_LOCAL_IP_ADDRESS;
</span><span class="cx"> apt_ip_get(&addr,pool);
</span><span class="cx"> return addr;
</span><span class="lines">@@ -3337,19 +3337,19 @@
</span><span class="cx"> rtp_config->jb_config.max_playout_delay = atol(val);
</span><span class="cx"> } else if (strcasecmp(param, "codecs") == 0) {
</span><span class="cx"> const mpf_codec_manager_t *codec_manager = mrcp_client_codec_manager_get(client);
</span><del>- if(codec_manager) {
</del><ins>+ if (codec_manager) {
</ins><span class="cx"> mpf_codec_manager_codec_list_load(codec_manager, &rtp_config->codec_list, val, pool);
</span><span class="cx"> }
</span><span class="cx"> } else if (strcasecmp(param, "ptime") == 0) {
</span><span class="cx"> rtp_config->ptime = (apr_uint16_t)atol(val);
</span><span class="cx"> #if UNI_VERSION_AT_LEAST(0,8,0)
</span><del>- } else if(strcasecmp(param, "rtcp") == 0) {
</del><ins>+ } else if (strcasecmp(param, "rtcp") == 0) {
</ins><span class="cx"> rtp_config->rtcp = atoi(val);
</span><del>- } else if(strcasecmp(param, "rtcp-bye") == 0) {
</del><ins>+ } else if (strcasecmp(param, "rtcp-bye") == 0) {
</ins><span class="cx"> rtp_config->rtcp_bye_policy = atoi(val);
</span><del>- } else if(strcasecmp(param, "rtcp-tx-interval") == 0) {
</del><ins>+ } else if (strcasecmp(param, "rtcp-tx-interval") == 0) {
</ins><span class="cx"> rtp_config->rtcp_tx_interval = (apr_uint16_t)atoi(val);
</span><del>- } else if(strcasecmp(param, "rtcp-rx-resolution") == 0) {
</del><ins>+ } else if (strcasecmp(param, "rtcp-rx-resolution") == 0) {
</ins><span class="cx"> rtp_config->rtcp_rx_resolution = (apr_uint16_t)atol(val);
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="lines">@@ -3470,7 +3470,7 @@
</span><span class="cx"> #if UNI_VERSION_AT_LEAST(0,8,0)
</span><span class="cx"> /* load the synthesizer and recognizer resources */
</span><span class="cx"> resource_loader = mrcp_resource_loader_create(FALSE, pool);
</span><del>- if(resource_loader) {
</del><ins>+ if (resource_loader) {
</ins><span class="cx"> apt_str_t synth_resource;
</span><span class="cx"> apt_str_t recog_resource;
</span><span class="cx"> apt_string_set(&synth_resource, "speechsynth");
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_dingalingmod_dingalingc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -874,7 +874,7 @@
</span><span class="cx"> switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
</span><span class="cx"> switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
</span><span class="cx">
</span><del>- if(globals.auto_nat && tech_pvt->profile->local_network &&
</del><ins>+ if (globals.auto_nat && tech_pvt->profile->local_network &&
</ins><span class="cx"> !switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network)) {
</span><span class="cx"> switch_port_t external_port = 0;
</span><span class="cx"> switch_nat_add_mapping((switch_port_t)tech_pvt->local_port, SWITCH_NAT_UDP, &external_port, SWITCH_FALSE);
</span><span class="lines">@@ -1232,7 +1232,7 @@
</span><span class="cx"> tech_pvt->rtp_session = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(globals.auto_nat && tech_pvt->profile->local_network &&
</del><ins>+ if (globals.auto_nat && tech_pvt->profile->local_network &&
</ins><span class="cx"> !switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network)) {
</span><span class="cx"> switch_nat_del_mapping((switch_port_t)tech_pvt->local_port, SWITCH_NAT_UDP);
</span><span class="cx"> }
</span><span class="lines">@@ -1247,9 +1247,9 @@
</span><span class="cx">
</span><span class="cx"> switch_thread_rwlock_unlock(tech_pvt->profile->rwlock);
</span><span class="cx">
</span><del>- if(tech_pvt->profile->purge) {
</del><ins>+ if (tech_pvt->profile->purge) {
</ins><span class="cx"> mdl_profile_t *profile = tech_pvt->profile;
</span><del>- if(switch_core_hash_delete(globals.profile_hash, profile->name) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_core_hash_delete(globals.profile_hash, profile->name) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile %s deleted successfully\n", profile->name);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1685,13 +1685,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(mdl_profile->purge) {
</del><ins>+ if (mdl_profile->purge) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile '%s' is marked for deletion, disallowing outgoing call\n", mdl_profile->name);
</span><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_NORMAL_UNSPECIFIED);
</span><span class="cx"> return SWITCH_CAUSE_NORMAL_UNSPECIFIED;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(switch_thread_rwlock_tryrdlock(mdl_profile->rwlock) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_thread_rwlock_tryrdlock(mdl_profile->rwlock) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't do read lock on profile '%s'\n", mdl_profile->name);
</span><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_NORMAL_UNSPECIFIED);
</span><span class="cx"> return SWITCH_CAUSE_NORMAL_UNSPECIFIED;
</span><span class="lines">@@ -2270,11 +2270,11 @@
</span><span class="cx">
</span><span class="cx"> static switch_bool_t match_profile(mdl_profile_t *profile, mdl_profile_t *new_profile)
</span><span class="cx"> {
</span><del>- if(profile == new_profile) {
</del><ins>+ if (profile == new_profile) {
</ins><span class="cx"> return SWITCH_TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(
</del><ins>+ if (
</ins><span class="cx"> ((!new_profile->name && !profile->name) ||
</span><span class="cx"> (new_profile->name && profile->name && !strcasecmp(new_profile->name, profile->name))) &&
</span><span class="cx"> ((!new_profile->login && !profile->login) ||
</span><span class="lines">@@ -2311,7 +2311,7 @@
</span><span class="cx"> ) {
</span><span class="cx"> int i;
</span><span class="cx"> if (switch_odbc_available()) {
</span><del>- if(!(
</del><ins>+ if (!(
</ins><span class="cx"> ((!new_profile->odbc_dsn && !profile->odbc_dsn) ||
</span><span class="cx"> (new_profile->odbc_dsn && profile->odbc_dsn && !strcasecmp(new_profile->odbc_dsn, profile->odbc_dsn))) &&
</span><span class="cx"> ((!new_profile->odbc_user && !profile->odbc_user) ||
</span><span class="lines">@@ -2324,7 +2324,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for(i=0; i<new_profile->acl_count; i++) {
</span><del>- if(strcasecmp(new_profile->acl[i], profile->acl[i]) != 0) {
</del><ins>+ if (strcasecmp(new_profile->acl[i], profile->acl[i]) != 0) {
</ins><span class="cx"> return SWITCH_FALSE;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2337,7 +2337,7 @@
</span><span class="cx"> {
</span><span class="cx"> mdl_profile_t *profile = NULL;
</span><span class="cx">
</span><del>- if((profile = switch_core_hash_find(globals.profile_hash, name))) {
</del><ins>+ if ((profile = switch_core_hash_find(globals.profile_hash, name))) {
</ins><span class="cx"> if (profile->user_flags & LDL_FLAG_COMPONENT) {
</span><span class="cx"> if (switch_odbc_available() && profile->odbc_dsn && profile->master_odbc) {
</span><span class="cx"> switch_odbc_handle_disconnect(profile->master_odbc);
</span><span class="lines">@@ -2347,21 +2347,21 @@
</span><span class="cx"> switch_mutex_destroy(profile->mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(switch_thread_rwlock_trywrlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_thread_rwlock_trywrlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile %s is busy\n", profile->name);
</span><span class="cx"> profile->purge = SWITCH_TRUE;
</span><del>- if(profile->handle) {
</del><ins>+ if (profile->handle) {
</ins><span class="cx"> ldl_handle_stop(profile->handle);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> switch_thread_rwlock_unlock(profile->rwlock);
</span><span class="cx"> profile->purge = SWITCH_TRUE;
</span><span class="cx">
</span><del>- if(profile->handle) {
</del><ins>+ if (profile->handle) {
</ins><span class="cx"> ldl_handle_stop(profile->handle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(switch_core_hash_delete(globals.profile_hash, profile->name) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_core_hash_delete(globals.profile_hash, profile->name) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile %s deleted successfully\n", profile->name);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2448,8 +2448,8 @@
</span><span class="cx"> if (profile) {
</span><span class="cx"> switch_core_hash_insert(name_hash, profile->name, profile->login);
</span><span class="cx">
</span><del>- if((old_profile = switch_core_hash_find(globals.profile_hash, profile->name))) {
- if(match_profile(old_profile, profile)) {
</del><ins>+ if ((old_profile = switch_core_hash_find(globals.profile_hash, profile->name))) {
+ if (match_profile(old_profile, profile)) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found pre-existing profile %s [%s]\n", profile->name, profile->login);
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overwriting pre-existing profile %s [%s]\n", profile->name, profile->login);
</span><span class="lines">@@ -2471,7 +2471,7 @@
</span><span class="cx"> switch_hash_this(hi, NULL, NULL, &data);
</span><span class="cx"> profile = (mdl_profile_t *) data;
</span><span class="cx">
</span><del>- if(switch_core_hash_find(name_hash, profile->name)) {
</del><ins>+ if (switch_core_hash_find(name_hash, profile->name)) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New profile %s [%s] activated\n", profile->name, profile->login);
</span><span class="cx"> } else {
</span><span class="cx"> switch_core_hash_insert(name_hash, profile->name, profile->name);
</span><span class="lines">@@ -2481,7 +2481,7 @@
</span><span class="cx"> for (hi = switch_hash_first(NULL, name_hash); hi; hi = switch_hash_next(hi)) {
</span><span class="cx"> switch_hash_this(hi, NULL, NULL, &data);
</span><span class="cx">
</span><del>- if((profile = switch_core_hash_find(globals.profile_hash, (char*)data))) {
</del><ins>+ if ((profile = switch_core_hash_find(globals.profile_hash, (char*)data))) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleting unused profile %s [%s]\n", profile->name, profile->login);
</span><span class="cx"> destroy_profile(profile->name);
</span><span class="cx"> }
</span><span class="lines">@@ -2928,13 +2928,13 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(profile->purge) {
</del><ins>+ if (profile->purge) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile '%s' is marked for deletion, disallowing incoming call\n", profile->name);
</span><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(switch_thread_rwlock_tryrdlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_thread_rwlock_tryrdlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't do read lock on profile '%s'\n", profile->name);
</span><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_iaxiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -3098,7 +3098,7 @@
</span><span class="cx"> ret = jb_get(cur->jb, &frame, now, get_interp_len(cur->voiceformat));
</span><span class="cx"> switch (ret) {
</span><span class="cx"> case JB_OK:
</span><del>- // if(frame.type == JB_TYPE_VOICE && next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next);
</del><ins>+ // if (frame.type == JB_TYPE_VOICE && next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next);
</ins><span class="cx"> event = frame.data;
</span><span class="cx"> event = handle_event(event);
</span><span class="cx"> if (event) {
</span><span class="lines">@@ -3107,7 +3107,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case JB_INTERP:
</span><del>- // if(next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next);
</del><ins>+ // if (next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next);
</ins><span class="cx"> /* create an interpolation frame */
</span><span class="cx"> //fprintf(stderr, "Making Interpolation frame\n");
</span><span class="cx"> event = (struct iax_event *) malloc(sizeof(struct iax_event));
</span><span class="lines">@@ -3125,7 +3125,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case JB_DROP:
</span><del>- // if(next != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not next %ld!\n", jb_next(cur->jb), next);
</del><ins>+ // if (next != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not next %ld!\n", jb_next(cur->jb), next);
</ins><span class="cx"> iax_event_free(frame.data);
</span><span class="cx"> break;
</span><span class="cx"> case JB_NOFRAME:
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> const char* val = NULL;
</span><span class="cx">
</span><span class="cx"> val = switch_channel_get_variable(tech_pvt->channel, "disable_q850_reason");
</span><del>- if(!val || switch_true(val)) {
</del><ins>+ if (!val || switch_true(val)) {
</ins><span class="cx"> if (cause > 0 && cause < 128) {
</span><span class="cx"> switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
</span><span class="cx"> } else if (cause == SWITCH_CAUSE_PICKED_OFF || cause == SWITCH_CAUSE_LOSE_RACE) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -1090,7 +1090,7 @@
</span><span class="cx"> if (switch_nat_add_mapping(profile->sip_port, SWITCH_NAT_TCP, NULL, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created TCP nat mapping for %s port %d\n", profile->name, profile->sip_port);
</span><span class="cx"> }
</span><del>- if(sofia_test_pflag(profile, PFLAG_TLS) && switch_nat_add_mapping(profile->tls_sip_port, SWITCH_NAT_TCP, NULL, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (sofia_test_pflag(profile, PFLAG_TLS) && switch_nat_add_mapping(profile->tls_sip_port, SWITCH_NAT_TCP, NULL, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created TCP/TLS nat mapping for %s port %d\n", profile->name, profile->tls_sip_port);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1302,7 +1302,7 @@
</span><span class="cx"> if (switch_nat_del_mapping(profile->sip_port, SWITCH_NAT_TCP) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleted TCP nat mapping for %s port %d\n", profile->name, profile->sip_port);
</span><span class="cx"> }
</span><del>- if(sofia_test_pflag(profile, PFLAG_TLS) && switch_nat_del_mapping(profile->tls_sip_port, SWITCH_NAT_TCP) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (sofia_test_pflag(profile, PFLAG_TLS) && switch_nat_del_mapping(profile->tls_sip_port, SWITCH_NAT_TCP) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleted TCP/TLS nat mapping for %s port %d\n", profile->name, profile->tls_sip_port);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4671,7 +4671,7 @@
</span><span class="cx"> const char* val = NULL;
</span><span class="cx"> sofia_set_flag_locked(b_tech_pvt, TFLAG_BYE);
</span><span class="cx"> val = switch_channel_get_variable(tech_pvt->channel, "disable_q850_reason");
</span><del>- if(!val || switch_true(val)) {
</del><ins>+ if (!val || switch_true(val)) {
</ins><span class="cx"> q850 = switch_core_session_sprintf(a_session, "Q.850;cause=16;text=\"normal_clearing\"");
</span><span class="cx"> }
</span><span class="cx"> nua_bye(b_tech_pvt->nh,
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -2848,7 +2848,7 @@
</span><span class="cx"> if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</span><span class="cx"> match = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span><span class="cx"> } else {
</span><del>- if(map->rm_encoding) {
</del><ins>+ if (map->rm_encoding) {
</ins><span class="cx"> match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
</span><span class="cx"> } else {
</span><span class="cx"> match = 0;
</span><span class="lines">@@ -2856,7 +2856,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (match) {
</span><del>- if(ptime > 0) {
</del><ins>+ if (ptime > 0) {
</ins><span class="cx"> switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (unsigned int) map->rm_rate, ptime);
</span><span class="cx"> } else {
</span><span class="cx"> switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh", imp->iananame, (unsigned int) map->rm_rate);
</span><span class="lines">@@ -4385,10 +4385,10 @@
</span><span class="cx"> goto mem_fail;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if((eoc = strstr(contact, ";fs_path="))) {
</del><ins>+ if ((eoc = strstr(contact, ";fs_path="))) {
</ins><span class="cx"> *eoc = '\0';
</span><span class="cx">
</span><del>- if(!(route = strdup(eoc + 9))) {
</del><ins>+ if (!(route = strdup(eoc + 9))) {
</ins><span class="cx"> goto mem_fail;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4415,7 +4415,7 @@
</span><span class="cx"> goto mem_fail;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if((eoc = strstr(to, ";fs_path="))) {
</del><ins>+ if ((eoc = strstr(to, ";fs_path="))) {
</ins><span class="cx"> *eoc++ = '>';
</span><span class="cx"> *eoc = '\0';
</span><span class="cx"> }
</span><span class="lines">@@ -4495,7 +4495,7 @@
</span><span class="cx"> dst = sofia_glue_get_destination((char*) o_contact);
</span><span class="cx"> switch_assert(dst);
</span><span class="cx">
</span><del>- if(dst->route_uri) {
</del><ins>+ if (dst->route_uri) {
</ins><span class="cx"> route_uri = sofia_glue_strip_uri(dst->route_uri);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_slac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> dst = sofia_glue_get_destination((char*) full_contact);
</span><span class="cx">
</span><del>- if(dst->route_uri) {
</del><ins>+ if (dst->route_uri) {
</ins><span class="cx"> route_uri = sofia_glue_strip_uri(dst->route_uri);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_shoutmod_shoutc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -835,7 +835,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> /* no data, so insert 1 second of silence */
</span><span class="cx"> newbytes = 2 * handle->samplerate;
</span><del>- if(newbytes < bytes) {
</del><ins>+ if (newbytes < bytes) {
</ins><span class="cx"> bytes = newbytes;
</span><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Padding mp3 stream with 1s of empty audio. (%s)\n", context->stream_url);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_lualualoadlibc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> NSObjectFileImage img;
</span><span class="cx"> NSObjectFileImageReturnCode ret;
</span><span class="cx"> /* this would be a rare case, but prevents crashing if it happens */
</span><del>- if(!_dyld_present()) {
</del><ins>+ if (!_dyld_present()) {
</ins><span class="cx"> lua_pushliteral(L, "dyld not present");
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodxml_intmod_xml_rpcmod_xml_rpcc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -790,7 +790,7 @@
</span><span class="cx"> //SocketClose(&(r->conn->socket));
</span><span class="cx">
</span><span class="cx"> HTTPWriteEnd(r);
</span><del>- //if(r->conn->channelP)
</del><ins>+ //if (r->conn->channelP)
</ins><span class="cx"> //ConnKill(r->conn);
</span><span class="cx"> //ChannelInterrupt(r->conn->channelP);
</span><span class="cx"> //ConnClose(r->conn);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_asrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_asr.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_asr.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/switch_core_asr.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> int argc = switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
</span><span class="cx"> for (i = 0; i < argc && param[i]; ++i) {
</span><span class="cx"> char *param_pair[2] = { 0 };
</span><del>- if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
</del><ins>+ if (switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
</ins><span class="cx"> switch_core_asr_text_param(ah, param_pair[0], param_pair[1]);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_speechc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_speech.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_speech.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/switch_core_speech.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> int argc = switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
</span><span class="cx"> for (i = 0; i < argc && param[i]; ++i) {
</span><span class="cx"> char *param_pair[2] = { 0 };
</span><del>- if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
</del><ins>+ if (switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
</ins><span class="cx"> switch_core_speech_text_param_tts(sh, param_pair[0], param_pair[1]);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_mprintfc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_mprintf.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_mprintf.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/switch_mprintf.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> static int et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){
</span><span class="cx"> int digit;
</span><span class="cx"> LONGDOUBLE_TYPE d;
</span><del>- if( (*cnt)++ >= 16 ) return '0';
</del><ins>+ if ( (*cnt)++ >= 16 ) return '0';
</ins><span class="cx"> digit = (int)*val;
</span><span class="cx"> d = digit;
</span><span class="cx"> digit += '0';
</span><span class="lines">@@ -263,16 +263,16 @@
</span><span class="cx"> count = length = 0;
</span><span class="cx"> bufpt = 0;
</span><span class="cx"> for(; (c=(*fmt))!=0; ++fmt){
</span><del>- if( c!='%' ){
</del><ins>+ if ( c!='%' ){
</ins><span class="cx"> int amt;
</span><span class="cx"> bufpt = (char *)fmt;
</span><span class="cx"> amt = 1;
</span><span class="cx"> while( (c=(*++fmt))!='%' && c!=0 ) amt++;
</span><span class="cx"> (*func)(arg,bufpt,amt);
</span><span class="cx"> count += amt;
</span><del>- if( c==0 ) break;
</del><ins>+ if ( c==0 ) break;
</ins><span class="cx"> }
</span><del>- if( (c=(*++fmt))==0 ){
</del><ins>+ if ( (c=(*++fmt))==0 ){
</ins><span class="cx"> errorflag = 1;
</span><span class="cx"> (*func)(arg,"%",1);
</span><span class="cx"> count++;
</span><span class="lines">@@ -295,9 +295,9 @@
</span><span class="cx"> }while( !done && (c=(*++fmt))!=0 );
</span><span class="cx"> /* Get the field width */
</span><span class="cx"> width = 0;
</span><del>- if( c=='*' ){
</del><ins>+ if ( c=='*' ){
</ins><span class="cx"> width = va_arg(ap,int);
</span><del>- if( width<0 ){
</del><ins>+ if ( width<0 ){
</ins><span class="cx"> flag_leftjustify = 1;
</span><span class="cx"> width = -width;
</span><span class="cx"> }
</span><span class="lines">@@ -308,16 +308,16 @@
</span><span class="cx"> c = *++fmt;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if( width > etBUFSIZE-10 ){
</del><ins>+ if ( width > etBUFSIZE-10 ){
</ins><span class="cx"> width = etBUFSIZE-10;
</span><span class="cx"> }
</span><span class="cx"> /* Get the precision */
</span><del>- if( c=='.' ){
</del><ins>+ if ( c=='.' ){
</ins><span class="cx"> precision = 0;
</span><span class="cx"> c = *++fmt;
</span><del>- if( c=='*' ){
</del><ins>+ if ( c=='*' ){
</ins><span class="cx"> precision = va_arg(ap,int);
</span><del>- if( precision<0 ) precision = -precision;
</del><ins>+ if ( precision<0 ) precision = -precision;
</ins><span class="cx"> c = *++fmt;
</span><span class="cx"> }else{
</span><span class="cx"> while( c>='0' && c<='9' ){
</span><span class="lines">@@ -329,10 +329,10 @@
</span><span class="cx"> precision = -1;
</span><span class="cx"> }
</span><span class="cx"> /* Get the conversion type modifier */
</span><del>- if( c=='l' ){
</del><ins>+ if ( c=='l' ){
</ins><span class="cx"> flag_long = 1;
</span><span class="cx"> c = *++fmt;
</span><del>- if( c=='l' ){
</del><ins>+ if ( c=='l' ){
</ins><span class="cx"> flag_longlong = 1;
</span><span class="cx"> c = *++fmt;
</span><span class="cx"> }else{
</span><span class="lines">@@ -344,9 +344,9 @@
</span><span class="cx"> /* Fetch the info entry for the field */
</span><span class="cx"> infop = 0;
</span><span class="cx"> for(idx=0; idx<etNINFO; idx++){
</span><del>- if( c==fmtinfo[idx].fmttype ){
</del><ins>+ if ( c==fmtinfo[idx].fmttype ){
</ins><span class="cx"> infop = &fmtinfo[idx];
</span><del>- if( useExtended || (infop->flags & FLAG_INTERN)==0 ){
</del><ins>+ if ( useExtended || (infop->flags & FLAG_INTERN)==0 ){
</ins><span class="cx"> xtype = infop->type;
</span><span class="cx"> }else{
</span><span class="cx"> return -1;
</span><span class="lines">@@ -355,13 +355,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> zExtra = 0;
</span><del>- if( infop==0 ){
</del><ins>+ if ( infop==0 ){
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /* Limit the precision to prevent overflowing buf[] during conversion */
</span><del>- if( precision>etBUFSIZE-40 && (infop->flags & FLAG_STRING)==0 ){
</del><ins>+ if ( precision>etBUFSIZE-40 && (infop->flags & FLAG_STRING)==0 ){
</ins><span class="cx"> precision = etBUFSIZE-40;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -392,28 +392,28 @@
</span><span class="cx"> flag_long = sizeof(char*)==sizeof(long int);
</span><span class="cx"> /* Fall through into the next case */
</span><span class="cx"> case etRADIX:
</span><del>- if( infop->flags & FLAG_SIGNED ){
</del><ins>+ if ( infop->flags & FLAG_SIGNED ){
</ins><span class="cx"> int64_t v;
</span><del>- if( flag_longlong ) v = va_arg(ap,int64_t);
- else if( flag_long ) v = va_arg(ap,long int);
</del><ins>+ if ( flag_longlong ) v = va_arg(ap,int64_t);
+ else if ( flag_long ) v = va_arg(ap,long int);
</ins><span class="cx"> else v = va_arg(ap,int);
</span><del>- if( v<0 ){
</del><ins>+ if ( v<0 ){
</ins><span class="cx"> longvalue = -v;
</span><span class="cx"> prefix = '-';
</span><span class="cx"> }else{
</span><span class="cx"> longvalue = v;
</span><del>- if( flag_plussign ) prefix = '+';
- else if( flag_blanksign ) prefix = ' ';
</del><ins>+ if ( flag_plussign ) prefix = '+';
+ else if ( flag_blanksign ) prefix = ' ';
</ins><span class="cx"> else prefix = 0;
</span><span class="cx"> }
</span><span class="cx"> }else{
</span><del>- if( flag_longlong ) longvalue = va_arg(ap,uint64_t);
- else if( flag_long ) longvalue = va_arg(ap,unsigned long int);
</del><ins>+ if ( flag_longlong ) longvalue = va_arg(ap,uint64_t);
+ else if ( flag_long ) longvalue = va_arg(ap,unsigned long int);
</ins><span class="cx"> else longvalue = va_arg(ap,unsigned int);
</span><span class="cx"> prefix = 0;
</span><span class="cx"> }
</span><del>- if( longvalue==0 ) flag_alternateform = 0;
- if( flag_zeropad && precision<width-(prefix!=0) ){
</del><ins>+ if ( longvalue==0 ) flag_alternateform = 0;
+ if ( flag_zeropad && precision<width-(prefix!=0) ){
</ins><span class="cx"> precision = width-(prefix!=0);
</span><span class="cx"> }
</span><span class="cx"> bufpt = &buf[etBUFSIZE-1];
</span><span class="lines">@@ -431,12 +431,12 @@
</span><span class="cx"> for(idx=precision-length; idx>0; idx--){
</span><span class="cx"> *(--bufpt) = '0'; /* Zero pad */
</span><span class="cx"> }
</span><del>- if( prefix ) *(--bufpt) = prefix; /* Add sign */
- if( flag_alternateform && infop->prefix ){ /* Add "0" or "0x" */
</del><ins>+ if ( prefix ) *(--bufpt) = prefix; /* Add sign */
+ if ( flag_alternateform && infop->prefix ){ /* Add "0" or "0x" */
</ins><span class="cx"> const char *pre;
</span><span class="cx"> char x;
</span><span class="cx"> pre = &aPrefix[infop->prefix];
</span><del>- if( *bufpt!=pre[0] ){
</del><ins>+ if ( *bufpt!=pre[0] ){
</ins><span class="cx"> for(; (x=(*pre))!=0; pre++) *(--bufpt) = x;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -447,17 +447,17 @@
</span><span class="cx"> case etGENERIC:
</span><span class="cx"> realvalue = va_arg(ap,double);
</span><span class="cx"> #ifndef SWITCH_OMIT_FLOATING_POINT
</span><del>- if( precision<0 ) precision = 6; /* Set default precision */
- if( precision>etBUFSIZE/2-10 ) precision = etBUFSIZE/2-10;
- if( realvalue<0.0 ){
</del><ins>+ if ( precision<0 ) precision = 6; /* Set default precision */
+ if ( precision>etBUFSIZE/2-10 ) precision = etBUFSIZE/2-10;
+ if ( realvalue<0.0 ){
</ins><span class="cx"> realvalue = -realvalue;
</span><span class="cx"> prefix = '-';
</span><span class="cx"> }else{
</span><del>- if( flag_plussign ) prefix = '+';
- else if( flag_blanksign ) prefix = ' ';
</del><ins>+ if ( flag_plussign ) prefix = '+';
+ else if ( flag_blanksign ) prefix = ' ';
</ins><span class="cx"> else prefix = 0;
</span><span class="cx"> }
</span><del>- if( xtype==etGENERIC && precision>0 ) precision--;
</del><ins>+ if ( xtype==etGENERIC && precision>0 ) precision--;
</ins><span class="cx"> #if 0
</span><span class="cx"> /* Rounding works like BSD when the constant 0.4999 is used. Wierd! */
</span><span class="cx"> for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
</span><span class="lines">@@ -465,16 +465,16 @@
</span><span class="cx"> /* It makes more sense to use 0.5 */
</span><span class="cx"> for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1){}
</span><span class="cx"> #endif
</span><del>- if( xtype==etFLOAT ) realvalue += rounder;
</del><ins>+ if ( xtype==etFLOAT ) realvalue += rounder;
</ins><span class="cx"> /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
</span><span class="cx"> exp = 0;
</span><del>- if( realvalue>0.0 ){
</del><ins>+ if ( realvalue>0.0 ){
</ins><span class="cx"> while( realvalue>=1e32 && exp<=350 ){ realvalue *= 1e-32; exp+=32; }
</span><span class="cx"> while( realvalue>=1e8 && exp<=350 ){ realvalue *= 1e-8; exp+=8; }
</span><span class="cx"> while( realvalue>=10.0 && exp<=350 ){ realvalue *= 0.1; exp++; }
</span><span class="cx"> while( realvalue<1e-8 && exp>=-350 ){ realvalue *= 1e8; exp-=8; }
</span><span class="cx"> while( realvalue<1.0 && exp>=-350 ){ realvalue *= 10.0; exp--; }
</span><del>- if( exp>350 || exp<-350 ){
</del><ins>+ if ( exp>350 || exp<-350 ){
</ins><span class="cx"> bufpt = "NaN";
</span><span class="cx"> length = 3;
</span><span class="cx"> break;
</span><span class="lines">@@ -486,13 +486,13 @@
</span><span class="cx"> ** or etFLOAT, as appropriate.
</span><span class="cx"> */
</span><span class="cx"> flag_exp = xtype==etEXP;
</span><del>- if( xtype!=etFLOAT ){
</del><ins>+ if ( xtype!=etFLOAT ){
</ins><span class="cx"> realvalue += rounder;
</span><del>- if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
</del><ins>+ if ( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
</ins><span class="cx"> }
</span><del>- if( xtype==etGENERIC ){
</del><ins>+ if ( xtype==etGENERIC ){
</ins><span class="cx"> flag_rtz = !flag_alternateform;
</span><del>- if( exp<-4 || exp>precision ){
</del><ins>+ if ( exp<-4 || exp>precision ){
</ins><span class="cx"> xtype = etEXP;
</span><span class="cx"> }else{
</span><span class="cx"> precision = precision - exp;
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> }else{
</span><span class="cx"> flag_rtz = 0;
</span><span class="cx"> }
</span><del>- if( xtype==etEXP ){
</del><ins>+ if ( xtype==etEXP ){
</ins><span class="cx"> e2 = 0;
</span><span class="cx"> }else{
</span><span class="cx"> e2 = exp;
</span><span class="lines">@@ -509,11 +509,11 @@
</span><span class="cx"> nsd = 0;
</span><span class="cx"> flag_dp = (precision>0) | flag_alternateform | flag_altform2;
</span><span class="cx"> /* The sign in front of the number */
</span><del>- if( prefix ){
</del><ins>+ if ( prefix ){
</ins><span class="cx"> *(bufpt++) = prefix;
</span><span class="cx"> }
</span><span class="cx"> /* Digits prior to the decimal point */
</span><del>- if( e2<0 ){
</del><ins>+ if ( e2<0 ){
</ins><span class="cx"> *(bufpt++) = '0';
</span><span class="cx"> }else{
</span><span class="cx"> for(; e2>=0; e2--){
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> /* The decimal point */
</span><del>- if( flag_dp ){
</del><ins>+ if ( flag_dp ){
</ins><span class="cx"> *(bufpt++) = '.';
</span><span class="cx"> }
</span><span class="cx"> /* "0" digits after the decimal point but before the first
</span><span class="lines">@@ -534,11 +534,11 @@
</span><span class="cx"> *(bufpt++) = (char)et_getdigit(&realvalue,&nsd);
</span><span class="cx"> }
</span><span class="cx"> /* Remove trailing zeros and the "." if no digits follow the "." */
</span><del>- if( flag_rtz && flag_dp ){
</del><ins>+ if ( flag_rtz && flag_dp ){
</ins><span class="cx"> while( bufpt[-1]=='0' ) *(--bufpt) = 0;
</span><span class="cx"> assert( bufpt>buf );
</span><del>- if( bufpt[-1]=='.' ){
- if( flag_altform2 ){
</del><ins>+ if ( bufpt[-1]=='.' ){
+ if ( flag_altform2 ){
</ins><span class="cx"> *(bufpt++) = '0';
</span><span class="cx"> }else{
</span><span class="cx"> *(--bufpt) = 0;
</span><span class="lines">@@ -546,14 +546,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> /* Add the "eNNN" suffix */
</span><del>- if( flag_exp || (xtype==etEXP && exp) ){
</del><ins>+ if ( flag_exp || (xtype==etEXP && exp) ){
</ins><span class="cx"> *(bufpt++) = aDigits[infop->charset];
</span><del>- if( exp<0 ){
</del><ins>+ if ( exp<0 ){
</ins><span class="cx"> *(bufpt++) = '-'; exp = -exp;
</span><span class="cx"> }else{
</span><span class="cx"> *(bufpt++) = '+';
</span><span class="cx"> }
</span><del>- if( exp>=100 ){
</del><ins>+ if ( exp>=100 ){
</ins><span class="cx"> *(bufpt++) = (char)(exp/100)+'0'; /* 100's digit */
</span><span class="cx"> exp %= 100;
</span><span class="cx"> }
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx">
</span><span class="cx"> /* Special case: Add leading zeros if the flag_zeropad flag is
</span><span class="cx"> ** set and we are not left justified */
</span><del>- if( flag_zeropad && !flag_leftjustify && length < width){
</del><ins>+ if ( flag_zeropad && !flag_leftjustify && length < width){
</ins><span class="cx"> int i;
</span><span class="cx"> int nPad = width - length;
</span><span class="cx"> for(i=width; i>=nPad; i--){
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> case etCHARLIT:
</span><span class="cx"> case etCHARX:
</span><span class="cx"> c = buf[0] = (char)(xtype==etCHARX ? va_arg(ap,int) : *++fmt);
</span><del>- if( precision>=0 ){
</del><ins>+ if ( precision>=0 ){
</ins><span class="cx"> for(idx=1; idx<precision; idx++) buf[idx] = (char)c;
</span><span class="cx"> length = precision;
</span><span class="cx"> }else{
</span><span class="lines">@@ -605,13 +605,13 @@
</span><span class="cx"> case etSTRING:
</span><span class="cx"> case etDYNSTRING:
</span><span class="cx"> bufpt = va_arg(ap,char*);
</span><del>- if( bufpt==0 ){
</del><ins>+ if ( bufpt==0 ){
</ins><span class="cx"> bufpt = "";
</span><del>- }else if( xtype==etDYNSTRING ){
</del><ins>+ }else if ( xtype==etDYNSTRING ){
</ins><span class="cx"> zExtra = bufpt;
</span><span class="cx"> }
</span><span class="cx"> length = strlen(bufpt);
</span><del>- if( precision>=0 && precision<length ) length = precision;
</del><ins>+ if ( precision>=0 && precision<length ) length = precision;
</ins><span class="cx"> break;
</span><span class="cx"> case etSQLESCAPE:
</span><span class="cx"> case etSQLESCAPE2:
</span><span class="lines">@@ -620,35 +620,35 @@
</span><span class="cx"> int needQuote;
</span><span class="cx"> char *escarg = va_arg(ap,char*);
</span><span class="cx"> isnull = escarg==0;
</span><del>- if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
</del><ins>+ if ( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
</ins><span class="cx"> for(i=n=0; (ch=escarg[i])!=0; i++){
</span><del>- if( ch=='\'' || (xtype==etSQLESCAPE3 && ch=='\\')) n++;
</del><ins>+ if ( ch=='\'' || (xtype==etSQLESCAPE3 && ch=='\\')) n++;
</ins><span class="cx"> }
</span><span class="cx"> needQuote = !isnull && xtype==etSQLESCAPE2;
</span><span class="cx"> n += i + 1 + needQuote*2;
</span><del>- if( n>etBUFSIZE ){
</del><ins>+ if ( n>etBUFSIZE ){
</ins><span class="cx"> bufpt = zExtra = malloc( n );
</span><del>- if( bufpt==0 ) return -1;
</del><ins>+ if ( bufpt==0 ) return -1;
</ins><span class="cx"> }else{
</span><span class="cx"> bufpt = buf;
</span><span class="cx"> }
</span><span class="cx"> j = 0;
</span><del>- if( needQuote ) bufpt[j++] = '\'';
</del><ins>+ if ( needQuote ) bufpt[j++] = '\'';
</ins><span class="cx"> for(i=0; (ch=escarg[i])!=0; i++){
</span><span class="cx"> bufpt[j++] = (char)ch;
</span><del>- if( ch=='\'' || ( xtype==etSQLESCAPE3 && ch=='\\')) bufpt[j++] = (char)ch;
</del><ins>+ if ( ch=='\'' || ( xtype==etSQLESCAPE3 && ch=='\\')) bufpt[j++] = (char)ch;
</ins><span class="cx"> }
</span><del>- if( needQuote ) bufpt[j++] = '\'';
</del><ins>+ if ( needQuote ) bufpt[j++] = '\'';
</ins><span class="cx"> bufpt[j] = 0;
</span><span class="cx"> length = j;
</span><span class="cx"> /* The precision is ignored on %q and %Q */
</span><del>- /* if( precision>=0 && precision<length ) length = precision; */
</del><ins>+ /* if ( precision>=0 && precision<length ) length = precision; */
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> #ifdef __UNSUPPORTED__
</span><span class="cx"> case etTOKEN: {
</span><span class="cx"> Token *pToken = va_arg(ap, Token*);
</span><del>- if( pToken && pToken->z ){
</del><ins>+ if ( pToken && pToken->z ){
</ins><span class="cx"> (*func)(arg, (char*)pToken->z, pToken->n);
</span><span class="cx"> }
</span><span class="cx"> length = width = 0;
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> int k = va_arg(ap, int);
</span><span class="cx"> struct SrcList_item *pItem = &pSrc->a[k];
</span><span class="cx"> assert( k>=0 && k<pSrc->nSrc );
</span><del>- if( pItem->zDatabase && pItem->zDatabase[0] ){
</del><ins>+ if ( pItem->zDatabase && pItem->zDatabase[0] ){
</ins><span class="cx"> (*func)(arg, pItem->zDatabase, strlen(pItem->zDatabase));
</span><span class="cx"> (*func)(arg, ".", 1);
</span><span class="cx"> }
</span><span class="lines">@@ -674,35 +674,35 @@
</span><span class="cx"> ** "length" characters long. The field width is "width". Do
</span><span class="cx"> ** the output.
</span><span class="cx"> */
</span><del>- if( !flag_leftjustify ){
</del><ins>+ if ( !flag_leftjustify ){
</ins><span class="cx"> register int nspace;
</span><span class="cx"> nspace = width-length;
</span><del>- if( nspace>0 ){
</del><ins>+ if ( nspace>0 ){
</ins><span class="cx"> count += nspace;
</span><span class="cx"> while( nspace>=etSPACESIZE ){
</span><span class="cx"> (*func)(arg,spaces,etSPACESIZE);
</span><span class="cx"> nspace -= etSPACESIZE;
</span><span class="cx"> }
</span><del>- if( nspace>0 ) (*func)(arg,spaces,nspace);
</del><ins>+ if ( nspace>0 ) (*func)(arg,spaces,nspace);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- if( length>0 ){
</del><ins>+ if ( length>0 ){
</ins><span class="cx"> (*func)(arg,bufpt,length);
</span><span class="cx"> count += length;
</span><span class="cx"> }
</span><del>- if( flag_leftjustify ){
</del><ins>+ if ( flag_leftjustify ){
</ins><span class="cx"> register int nspace;
</span><span class="cx"> nspace = width-length;
</span><del>- if( nspace>0 ){
</del><ins>+ if ( nspace>0 ){
</ins><span class="cx"> count += nspace;
</span><span class="cx"> while( nspace>=etSPACESIZE ){
</span><span class="cx"> (*func)(arg,spaces,etSPACESIZE);
</span><span class="cx"> nspace -= etSPACESIZE;
</span><span class="cx"> }
</span><del>- if( nspace>0 ) (*func)(arg,spaces,nspace);
</del><ins>+ if ( nspace>0 ) (*func)(arg,spaces,nspace);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- if( zExtra ){
</del><ins>+ if ( zExtra ){
</ins><span class="cx"> free(zExtra);
</span><span class="cx"> }
</span><span class="cx"> }/* End for loop over the format string */
</span><span class="lines">@@ -731,27 +731,27 @@
</span><span class="cx"> static void mout(void *arg, const char *zNewText, int nNewChar){
</span><span class="cx"> struct sgMprintf *pM = (struct sgMprintf*)arg;
</span><span class="cx"> pM->nTotal += nNewChar;
</span><del>- if( pM->nChar + nNewChar + 1 > pM->nAlloc ){
- if( pM->xRealloc==0 ){
</del><ins>+ if ( pM->nChar + nNewChar + 1 > pM->nAlloc ){
+ if ( pM->xRealloc==0 ){
</ins><span class="cx"> nNewChar = pM->nAlloc - pM->nChar - 1;
</span><span class="cx"> }else{
</span><span class="cx"> pM->nAlloc = pM->nChar + nNewChar*2 + 1;
</span><del>- if( pM->zText==pM->zBase ){
</del><ins>+ if ( pM->zText==pM->zBase ){
</ins><span class="cx"> pM->zText = pM->xRealloc(0, pM->nAlloc);
</span><del>- if( pM->zText && pM->nChar ){
</del><ins>+ if ( pM->zText && pM->nChar ){
</ins><span class="cx"> memcpy(pM->zText, pM->zBase, pM->nChar);
</span><span class="cx"> }
</span><span class="cx"> }else{
</span><span class="cx"> char *zNew;
</span><span class="cx"> zNew = pM->xRealloc(pM->zText, pM->nAlloc);
</span><del>- if( zNew ){
</del><ins>+ if ( zNew ){
</ins><span class="cx"> pM->zText = zNew;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if( pM->zText ){
- if( nNewChar>0 ){
</del><ins>+ if ( pM->zText ){
+ if ( nNewChar>0 ){
</ins><span class="cx"> memcpy(&pM->zText[pM->nChar], zNewText, nNewChar);
</span><span class="cx"> pM->nChar += nNewChar;
</span><span class="cx"> }
</span><span class="lines">@@ -777,15 +777,15 @@
</span><span class="cx"> sM.nAlloc = nInitBuf;
</span><span class="cx"> sM.xRealloc = xRealloc;
</span><span class="cx"> vxprintf(mout, &sM, useInternal, zFormat, ap);
</span><del>- if( xRealloc ){
- if( sM.zText==sM.zBase ){
</del><ins>+ if ( xRealloc ){
+ if ( sM.zText==sM.zBase ){
</ins><span class="cx"> sM.zText = xRealloc(0, sM.nChar+1);
</span><del>- if( sM.zText ){
</del><ins>+ if ( sM.zText ){
</ins><span class="cx"> memcpy(sM.zText, sM.zBase, sM.nChar+1);
</span><span class="cx"> }
</span><del>- }else if( sM.nAlloc>sM.nChar+10 ){
</del><ins>+ }else if ( sM.nAlloc>sM.nChar+10 ){
</ins><span class="cx"> char *zNew = xRealloc(sM.zText, sM.nChar+1);
</span><del>- if( zNew ){
</del><ins>+ if ( zNew ){
</ins><span class="cx"> sM.zText = zNew;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_natc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_nat.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_nat.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/switch_nat.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">
</span><span class="cx"> if (proto == SWITCH_NAT_TCP) {
</span><span class="cx"> sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_TCP, port, port, 31104000);
</span><del>- } else if(proto == SWITCH_NAT_UDP) {
</del><ins>+ } else if (proto == SWITCH_NAT_UDP) {
</ins><span class="cx"> sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_UDP, port, port, 31104000);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> if (proto == SWITCH_NAT_TCP) {
</span><span class="cx"> r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str,
</span><span class="cx"> nat_globals.pvt_addr, "FreeSWITCH", "TCP", 0);
</span><del>- } else if(proto == SWITCH_NAT_UDP) {
</del><ins>+ } else if (proto == SWITCH_NAT_UDP) {
</ins><span class="cx"> r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str,
</span><span class="cx"> nat_globals.pvt_addr, "FreeSWITCH", "UDP", 0);
</span><span class="cx"> }
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx">
</span><span class="cx"> if (proto == SWITCH_NAT_TCP) {
</span><span class="cx"> sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_TCP, port, port, 0);
</span><del>- } else if(proto == SWITCH_NAT_UDP) {
</del><ins>+ } else if (proto == SWITCH_NAT_UDP) {
</ins><span class="cx"> sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_UDP, port, port, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx">
</span><span class="cx"> if (proto == SWITCH_NAT_TCP) {
</span><span class="cx"> r = UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "TCP", 0);
</span><del>- } else if(proto == SWITCH_NAT_UDP) {
</del><ins>+ } else if (proto == SWITCH_NAT_UDP) {
</ins><span class="cx"> r = UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "UDP", 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (15892 => 15893)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2009-12-11 00:29:40 UTC (rev 15892)
+++ freeswitch/trunk/src/switch_rtp.c 2009-12-11 01:20:26 UTC (rev 15893)
</span><span class="lines">@@ -2974,7 +2974,7 @@
</span><span class="cx"> if (zrtp_session_info.sas_is_ready) {
</span><span class="cx"> if (rtp_session->zrtp_mitm_tries > ZRTP_MITM_TRIES) {
</span><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><del>- } else if(zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) {
</del><ins>+ } else if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) {
</ins><span class="cx"> switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
</span><span class="cx"> zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid,
</span><span class="cx"> &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>