<!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][15542] </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=15542">15542</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-19 08:24:59 -0600 (Thu, 19 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add new apr functions/macros needed by unimrcp update</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsaprupdate">freeswitch/trunk/libs/apr/.update</a></li>
<li><a href="#freeswitchtrunklibsaprincludeapr_hashh">freeswitch/trunk/libs/apr/include/apr_hash.h</a></li>
<li><a href="#freeswitchtrunklibsaprincludeapr_tablesh">freeswitch/trunk/libs/apr/include/apr_tables.h</a></li>
<li><a href="#freeswitchtrunklibsaprtablesapr_hashc">freeswitch/trunk/libs/apr/tables/apr_hash.c</a></li>
<li><a href="#freeswitchtrunklibsaprtablesapr_tablesc">freeswitch/trunk/libs/apr/tables/apr_tables.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsaprupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr/.update (15541 => 15542)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/apr/.update 2009-11-19 14:20:53 UTC (rev 15541)
+++ freeswitch/trunk/libs/apr/.update 2009-11-19 14:24:59 UTC (rev 15542)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Mon Jun 8 11:30:01 EDT 2009
</del><ins>+Thu Nov 19 09:24:37 EST 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibsaprincludeapr_hashh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr/include/apr_hash.h (15541 => 15542)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/apr/include/apr_hash.h 2009-11-19 14:20:53 UTC (rev 15541)
+++ freeswitch/trunk/libs/apr/include/apr_hash.h 2009-11-19 14:24:59 UTC (rev 15542)
</span><span class="lines">@@ -175,6 +175,12 @@
</span><span class="cx"> APR_DECLARE(unsigned int) apr_hash_count(apr_hash_t *ht);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Clear any key/value pairs in the hash table.
+ * @param ht The hash table
+ */
+APR_DECLARE(void) apr_hash_clear(apr_hash_t *ht);
+
+/**
</ins><span class="cx"> * Merge two hash tables into one new hash table. The values of the overlay
</span><span class="cx"> * hash override the values of the base if both have the same key. Both
</span><span class="cx"> * hash tables must use the same hash function.
</span></span></pre></div>
<a id="freeswitchtrunklibsaprincludeapr_tablesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr/include/apr_tables.h (15541 => 15542)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/apr/include/apr_tables.h 2009-11-19 14:20:53 UTC (rev 15541)
+++ freeswitch/trunk/libs/apr/include/apr_tables.h 2009-11-19 14:24:59 UTC (rev 15542)
</span><span class="lines">@@ -120,6 +120,25 @@
</span><span class="cx"> */
</span><span class="cx"> APR_DECLARE(void *) apr_array_push(apr_array_header_t *arr);
</span><span class="cx">
</span><ins>+/** A helper macro for accessing a member of an APR array.
+ *
+ * @param ary the array
+ * @param i the index into the array to return
+ * @param type the type of the objects stored in the array
+ *
+ * @return the item at index i
+ */
+#define APR_ARRAY_IDX(ary,i,type) (((type *)(ary)->elts)[i])
+
+/** A helper macro for pushing elements into an APR array.
+ *
+ * @param ary the array
+ * @param type the type of the objects stored in the array
+ *
+ * @return the location where the new object should be placed
+ */
+#define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
+
</ins><span class="cx"> /**
</span><span class="cx"> * Remove an element from an array (as a first-in, last-out stack)
</span><span class="cx"> * @param arr The array to remove an element from.
</span><span class="lines">@@ -129,6 +148,14 @@
</span><span class="cx"> APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Remove all elements from an array.
+ * @param arr The array to remove all elements from.
+ * @remark As the underlying storage is allocated from a pool, no
+ * memory is freed by this operation, but is available for reuse.
+ */
+APR_DECLARE(void) apr_array_clear(apr_array_header_t *arr);
+
+/**
</ins><span class="cx"> * Concatenate two arrays together
</span><span class="cx"> * @param dst The destination array, and the one to go first in the combined
</span><span class="cx"> * array
</span></span></pre></div>
<a id="freeswitchtrunklibsaprtablesapr_hashc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr/tables/apr_hash.c (15541 => 15542)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/apr/tables/apr_hash.c 2009-11-19 14:20:53 UTC (rev 15541)
+++ freeswitch/trunk/libs/apr/tables/apr_hash.c 2009-11-19 14:24:59 UTC (rev 15542)
</span><span class="lines">@@ -367,6 +367,13 @@
</span><span class="cx"> return ht->count;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+APR_DECLARE(void) apr_hash_clear(apr_hash_t *ht)
+{
+ apr_hash_index_t *hi;
+ for (hi = apr_hash_first(NULL, ht); hi; hi = apr_hash_next(hi))
+ apr_hash_set(ht, hi->this->key, hi->this->klen, NULL);
+}
+
</ins><span class="cx"> APR_DECLARE(apr_hash_t*) apr_hash_overlay(apr_pool_t *p,
</span><span class="cx"> const apr_hash_t *overlay,
</span><span class="cx"> const apr_hash_t *base)
</span></span></pre></div>
<a id="freeswitchtrunklibsaprtablesapr_tablesc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr/tables/apr_tables.c (15541 => 15542)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/apr/tables/apr_tables.c 2009-11-19 14:20:53 UTC (rev 15541)
+++ freeswitch/trunk/libs/apr/tables/apr_tables.c 2009-11-19 14:24:59 UTC (rev 15542)
</span><span class="lines">@@ -90,6 +90,11 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+APR_DECLARE(void) apr_array_clear(apr_array_header_t *arr)
+{
+ arr->nelts = 0;
+}
+
</ins><span class="cx"> APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr)
</span><span class="cx"> {
</span><span class="cx"> if (apr_is_empty_array(arr)) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>