<!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>[68684] trunk/base/src/cregistry/entry.c</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">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/68684">68684</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2010-06-10 04:20:15 -0700 (Thu, 10 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>clean up use of reg_strcat</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrccregistryentryc">trunk/base/src/cregistry/entry.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrccregistryentryc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/cregistry/entry.c (68683 => 68684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/entry.c 2010-06-10 07:28:20 UTC (rev 68683)
+++ trunk/base/src/cregistry/entry.c 2010-06-10 11:20:15 UTC (rev 68684)
</span><span class="lines">@@ -78,10 +78,10 @@
</span><span class="cx"> * @param [in,out] dst_space number of characters `dst` can hold
</span><span class="cx"> * @param [in] src string to concatenate to `dst`
</span><span class="cx"> */
</span><del>-static int reg_strcat(char** dst, int* dst_len, int* dst_space, char* src) {
- int src_len = strlen(src);
- int result_len = *dst_len + src_len;
- if (result_len >= *dst_space) {
</del><ins>+static int reg_strcat(char** dst, size_t* dst_len, size_t* dst_space, char* src) {
+ size_t src_len = strlen(src);
+ size_t result_len = *dst_len + src_len;
+ if (result_len > *dst_space) {
</ins><span class="cx"> char* new_dst;
</span><span class="cx"> *dst_space *= 2;
</span><span class="cx"> if (*dst_space < result_len) {
</span><span class="lines">@@ -511,8 +511,7 @@
</span><span class="cx"> int i;
</span><span class="cx"> char* kwd = " WHERE ";
</span><span class="cx"> char* query;
</span><del>- int query_len = 29;
- int query_space = 29;
</del><ins>+ size_t query_len, query_space;
</ins><span class="cx"> int result;
</span><span class="cx"> /* get the strategy */
</span><span class="cx"> char* op = reg_strategy_op(strategy, errPtr);
</span><span class="lines">@@ -524,6 +523,7 @@
</span><span class="cx"> if (!query) {
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><ins>+ query_len = query_space = strlen(query);
</ins><span class="cx"> for (i=0; i<key_count; i++) {
</span><span class="cx"> char* cond = sqlite3_mprintf(op, keys[i], vals[i]);
</span><span class="cx"> if (!cond || !reg_strcat(&query, &query_len, &query_space, kwd)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> kwd = " AND ";
</span><span class="cx"> }
</span><span class="cx"> /* do the query */
</span><del>- result = reg_all_entries(reg, query, query_len, entries, errPtr);
</del><ins>+ result = reg_all_entries(reg, query, -1, entries, errPtr);
</ins><span class="cx"> free(query);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>