<!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][14413] </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=14413">14413</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-07-29 10:14:06 -0500 (Wed, 29 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: patch from Carlos Talbot, interface is a reserved word on Windows VC++</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (14412 => 14413)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-07-29 11:46:23 UTC (rev 14412)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-07-29 15:14:06 UTC (rev 14413)
</span><span class="lines">@@ -213,25 +213,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* BEGIN: Changes here */
</span><del>-static switch_status_t interface_exists(char *interface)
</del><ins>+static switch_status_t interface_exists(char *the_interface)
</ins><span class="cx"> {
</span><span class="cx"> int i;
</span><span class="cx"> int interface_id;
</span><span class="cx">
</span><del>- if ( *interface == '#') { /* look by interface id or interface name */
- interface++;
- switch_assert(interface);
- interface_id = atoi(interface);
</del><ins>+ if ( *the_interface == '#') { /* look by interface id or interface name */
+ the_interface++;
+ switch_assert(the_interface);
+ interface_id = atoi(the_interface);
</ins><span class="cx">
</span><span class="cx"> /* take a number as interface id */
</span><del>- if ( interface_id > 0 || (interface_id == 0 && strcmp(interface, "0") == 0 )) {
</del><ins>+ if ( interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0 )) {
</ins><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[interface_id].name)) {
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> for (interface_id = 0; interface_id < SKYPIAX_MAX_INTERFACES; interface_id++) {
</span><del>- if (strcmp(globals.SKYPIAX_INTERFACES[interface_id].name, interface) == 0) {
</del><ins>+ if (strcmp(globals.SKYPIAX_INTERFACES[interface_id].name, the_interface) == 0) {
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) {
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[i].name)) {
</span><del>- if (strcmp(globals.SKYPIAX_INTERFACES[i].name, interface) == 0) {
</del><ins>+ if (strcmp(globals.SKYPIAX_INTERFACES[i].name, the_interface) == 0) {
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t remove_interface(char *interface)
</del><ins>+static switch_status_t remove_interface(char *the_interface)
</ins><span class="cx"> {
</span><span class="cx"> int x = 100;
</span><span class="cx"> unsigned int howmany = 8;
</span><span class="lines">@@ -262,18 +262,18 @@
</span><span class="cx"> //running = 0;
</span><span class="cx">
</span><span class="cx">
</span><del>- if ( *interface == '#') { /* remove by interface id or interface name */
- interface++;
- switch_assert(interface);
- interface_id = atoi(interface);
</del><ins>+ if ( *the_interface == '#') { /* remove by interface id or interface name */
+ the_interface++;
+ switch_assert(the_interface);
+ interface_id = atoi(the_interface);
</ins><span class="cx">
</span><del>- if ( interface_id > 0 || (interface_id == 0 && strcmp(interface, "0") == 0 )) {
</del><ins>+ if ( interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0 )) {
</ins><span class="cx"> /* take a number as interface id */
</span><span class="cx"> tech_pvt = &globals.SKYPIAX_INTERFACES[interface_id];
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> for (interface_id = 0; interface_id < SKYPIAX_MAX_INTERFACES; interface_id++) {
</span><del>- if (strcmp(globals.SKYPIAX_INTERFACES[interface_id].name, interface) == 0) {
</del><ins>+ if (strcmp(globals.SKYPIAX_INTERFACES[interface_id].name, the_interface) == 0) {
</ins><span class="cx"> tech_pvt = &globals.SKYPIAX_INTERFACES[interface_id];
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else { /* remove by skype_user */
</span><span class="cx"> for (interface_id = 0; interface_id < SKYPIAX_MAX_INTERFACES; interface_id++) {
</span><del>- if (strcmp(globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface) == 0) {
</del><ins>+ if (strcmp(globals.SKYPIAX_INTERFACES[interface_id].skype_user, the_interface) == 0) {
</ins><span class="cx"> tech_pvt = &globals.SKYPIAX_INTERFACES[interface_id];
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -290,12 +290,12 @@
</span><span class="cx">
</span><span class="cx"> if (!tech_pvt) {
</span><span class="cx"> DEBUGA_SKYPE("interface '%s' does not exist\n", SKYPIAX_P_LOG,
</span><del>- interface);
</del><ins>+ the_interface);
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[interface_id].session_uuid_str)) {
</span><del>- DEBUGA_SKYPE("interface '%s' is busy\n", SKYPIAX_P_LOG, interface);
</del><ins>+ DEBUGA_SKYPE("interface '%s' is busy\n", SKYPIAX_P_LOG, the_interface);
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -350,17 +350,17 @@
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(globals.mutex);
</span><span class="cx"> if(globals.sk_console == &globals.SKYPIAX_INTERFACES[interface_id]){
</span><del>- DEBUGA_SKYPE("interface '%s' no more console\n", SKYPIAX_P_LOG, interface);
</del><ins>+ DEBUGA_SKYPE("interface '%s' no more console\n", SKYPIAX_P_LOG, the_interface);
</ins><span class="cx"> globals.sk_console = NULL;
</span><span class="cx"> } else {
</span><del>- DEBUGA_SKYPE("interface '%s' STILL console\n", SKYPIAX_P_LOG, interface);
</del><ins>+ DEBUGA_SKYPE("interface '%s' STILL console\n", SKYPIAX_P_LOG, the_interface);
</ins><span class="cx"> }
</span><span class="cx"> memset(&globals.SKYPIAX_INTERFACES[interface_id], '\0', sizeof(private_t));
</span><span class="cx"> globals.real_interfaces--;
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("interface '%s' deleted successfully\n", SKYPIAX_P_LOG,
</span><del>- interface);
</del><ins>+ the_interface);
</ins><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].running=1;
</span><span class="cx"> end:
</span><span class="cx"> //running = 1;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>