<!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][14790] </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=14790">14790</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-09-08 14:29:51 -0500 (Tue, 08 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removed // comments to adhere to coding guidelines</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 (14789 => 14790)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-08 19:05:32 UTC (rev 14789)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-08 19:29:51 UTC (rev 14790)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (!switch_strlen_zero(helper->next_template_name)) goto done;
</span><span class="cx">
</span><span class="cx"> /* up the row counter */
</span><del>- helper->tmp_i++; // TODO: WILL THIS GO WRONG FOR NESTED QUERIES ?? THINK ABOUT IT !!!
</del><ins>+ helper->tmp_i++; /* TODO: WILL THIS GO WRONG FOR NESTED QUERIES ?? THINK ABOUT IT !!! */
</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">@@ -152,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t xml_odbc_do_set_event_header(xml_odbc_session_helper_t *helper)
</span><span class="cx"> {
</span><del>- char *name = (char *) switch_xml_attr(helper->xml_in_cur, "name"); // the xml-odbc-do name attr
</del><ins>+ char *name = (char *) switch_xml_attr(helper->xml_in_cur, "name"); /* the xml-odbc-do name attr */
</ins><span class="cx">
</span><span class="cx"> char *if_name = (char *) switch_xml_attr(helper->xml_in_cur, "if-name");
</span><span class="cx"> if (if_name) { if_name = switch_event_expand_headers_by_pool(helper->pool, helper->event, if_name); }
</span><span class="lines">@@ -249,8 +249,8 @@
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(name, "break-to")) {
</span><span class="cx"> status = xml_odbc_do_break_to(helper);
</span><del>- } else if (!strcasecmp(name, "check-event-header")) { // check-event-header is the same as set-event-header
- status = xml_odbc_do_set_event_header(helper); // except no to-name or to-value are given..
</del><ins>+ } else if (!strcasecmp(name, "check-event-header")) { /* check-event-header is the same as set-event-header */
+ status = xml_odbc_do_set_event_header(helper); /* except no to-name or to-value are given.. */
</ins><span class="cx"> } else if (!strcasecmp(name, "set-event-header")) {
</span><span class="cx"> status = xml_odbc_do_set_event_header(helper);
</span><span class="cx"> } else if (!strcasecmp(name, "query")) {
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> switch_uuid_format(uuid_str, &uuid);
</span><span class="cx">
</span><span class="cx"> /* generate a temporary filename to store the generated xml in */
</span><del>- // use switch_core_sprintf here ?!?!
</del><ins>+ /* use switch_core_sprintf here ?!?! */
</ins><span class="cx"> switch_snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str);
</span><span class="cx">
</span><span class="cx"> /* open (temporary) file */
</span><span class="lines">@@ -467,10 +467,7 @@
</span><span class="cx"> cleanup:
</span><span class="cx"> switch_xml_free(helper.xml_out);
</span><span class="cx"> switch_core_destroy_memory_pool(&pool);
</span><del>- /* free helper ?? */
- /* free filename */
</del><span class="cx">
</span><del>- //done:
</del><span class="cx"> return xml_out;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -530,9 +527,9 @@
</span><span class="cx"> binding_count++;
</span><span class="cx"> binding = NULL;
</span><span class="cx">
</span><del>- // change odbc-dsn to something like odbc-handle with name=default and dsn=a:b:c
- // so a linked list or something is created with multiple handles that can be
- // selected from xml-odbc-do name=query !!! that would be COOL !!!
</del><ins>+ /* change odbc-dsn to something like odbc-handle with name=default and dsn=a:b:c
+ * so a linked list or something is created with multiple handles that can be
+ * selected from xml-odbc-do name=query !!! that would be COOL !!! */
</ins><span class="cx"> } else if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) {
</span><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></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>