<!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][15244] </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=15244">15244</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-10-27 04:53:22 -0500 (Tue, 27 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replaced switch_strlen_zero with zstr</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c (15243 => 15244)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-10-27 06:14:00 UTC (rev 15243)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-10-27 09:53:22 UTC (rev 15244)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (switch_strlen_zero(cmd)) {
</del><ins>+ if (zstr(cmd)) {
</ins><span class="cx"> goto usage;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> xml_odbc_session_helper_t *helper = (xml_odbc_session_helper_t *) pArg;
</span><span class="cx"> int i, tmp_rowcount;
</span><span class="cx">
</span><del>- if (!switch_strlen_zero(helper->next_template_name)) goto done;
</del><ins>+ if (!zstr(helper->next_template_name)) goto done;
</ins><span class="cx">
</span><span class="cx"> /* loop through all columns and store them in helper->event->headers */
</span><span class="cx"> for (i = 0; i < argc; i++) {
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!switch_strlen_zero(empty_result_break_to) && helper->rowcount == 0) {
</del><ins>+ if (!zstr(empty_result_break_to) && helper->rowcount == 0) {
</ins><span class="cx"> helper->next_template_name = empty_result_break_to;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> if (!strcasecmp(helper->xml_in_cur->name, "xml-odbc-do")) {
</span><span class="cx"> char *name = (char *) switch_xml_attr_soft(helper->xml_in_cur, "name");
</span><span class="cx">
</span><del>- if (switch_strlen_zero(name)) {
</del><ins>+ if (zstr(name)) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do because no name is given\n");
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* just copy xml_in_cur to xml_out */
</span><del>- if (switch_strlen_zero(helper->xml_out_cur->name)) {
</del><ins>+ if (zstr(helper->xml_out_cur->name)) {
</ins><span class="cx"> helper->xml_out_cur->name = switch_core_strdup(helper->pool, helper->xml_in_cur->name);
</span><span class="cx">
</span><span class="cx"> } else if (!(helper->xml_out_cur = switch_xml_add_child_d(helper->xml_out_cur, helper->xml_in_cur->name, helper->xml_out_cur_off++))) {
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> /* restore helper->xml_out_cur in case it was changed during render_tag */
</span><span class="cx"> helper->xml_out_cur = xml_out_cur_tmp;
</span><span class="cx">
</span><del>- if (!switch_strlen_zero(helper->next_template_name)) goto done;
</del><ins>+ if (!zstr(helper->next_template_name)) goto done;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> if ((helper->xml_in_cur = switch_xml_find_child(globals.templates_tag, "template", "name", helper->next_template_name))) {
</span><span class="cx"> helper->next_template_name = "";
</span><span class="cx"> status = xml_odbc_render_children(helper);
</span><del>- if (!switch_strlen_zero(helper->next_template_name)) goto reset;
</del><ins>+ if (!zstr(helper->next_template_name)) goto reset;
</ins><span class="cx"> } else {
</span><span class="cx"> helper->next_template_name = "not-found";
</span><span class="cx"> goto reset;
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> var = (char *) switch_xml_attr_soft(param, "name");
</span><span class="cx"> val = (char *) switch_xml_attr_soft(param, "value");
</span><span class="cx">
</span><del>- if (!strcasecmp(var, "binding") && !switch_strlen_zero(val)) {
</del><ins>+ if (!strcasecmp(var, "binding") && !zstr(val)) {
</ins><span class="cx"> if (!(binding = malloc(sizeof(*binding)))) {
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> /* change odbc-dsn to something like odbc-handle with name=default and dsn=a:b:c
</span><span class="cx"> * so a linked list or something is created with multiple handles that can be
</span><span class="cx"> * selected from xml-odbc-do name=query !!! that would be COOL !!! */
</span><del>- } else if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) {
</del><ins>+ } else if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) {
</ins><span class="cx"> globals.odbc_dsn = switch_core_strdup(globals.pool, val);
</span><span class="cx"> if ((odbc_user = strchr(globals.odbc_dsn, ':'))) {
</span><span class="cx"> *odbc_user++ = '\0';
</span><span class="lines">@@ -578,13 +578,13 @@
</span><span class="cx"> *odbc_pass++ = '\0';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else if (!strcasecmp(var, "debug") && !switch_strlen_zero(val)) {
</del><ins>+ } else if (!strcasecmp(var, "debug") && !zstr(val)) {
</ins><span class="cx"> if (!strcasecmp(val, "true") || !strcasecmp(val, "on")) {
</span><span class="cx"> globals.debug = SWITCH_TRUE;
</span><span class="cx"> } else {
</span><span class="cx"> globals.debug = SWITCH_FALSE;
</span><span class="cx"> }
</span><del>- } else if (!strcasecmp(var, "keep-files-around") && !switch_strlen_zero(val)) {
</del><ins>+ } else if (!strcasecmp(var, "keep-files-around") && !zstr(val)) {
</ins><span class="cx"> if (!strcasecmp(val, "true") || !strcasecmp(val, "on")) {
</span><span class="cx"> globals.keep_files_around = SWITCH_TRUE;
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>