You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2005/02/08 00:11:51 UTC

svn commit: r151768 [3/47] - in apr/site/trunk/docs/docs/apr: ./ iconv/ util/

Modified: apr/site/trunk/docs/docs/apr-iconv/doxygen.css
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/doxygen.css?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/doxygen.css (original)
+++ apr/site/trunk/docs/docs/apr-iconv/doxygen.css Mon Feb  7 15:10:17 2005
@@ -81,7 +81,7 @@
        font-weight: bold;
 	font-family: Geneva, Arial, Helvetica, sans-serif;
 }
-DIV.groupText { margin-left: 16px; font-style: italic; font-size: 14px }
+DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
 BODY {
 	background: white;
 	color: black;
@@ -135,10 +135,10 @@
 	padding: 8px 10px;
 }
 .mdescLeft {
-       padding: 0px 8px 4px 8px;
-	font-size: 14px;
+	font-size: smaller;
 	font-style: italic;
 	background-color: #FAFAFA;
+	padding-left: 8px;
 	border-top: 1px none #E0E0E0;
 	border-right: 1px none #E0E0E0;
 	border-bottom: 1px none #E0E0E0;
@@ -146,15 +146,17 @@
 	margin: 0px;
 }
 .mdescRight {
-       padding: 0px 8px 4px 8px;
-	font-size: 14px;
+	font-size: smaller;
 	font-style: italic;
 	background-color: #FAFAFA;
+	padding-left: 4px;
 	border-top: 1px none #E0E0E0;
 	border-right: 1px none #E0E0E0;
 	border-bottom: 1px none #E0E0E0;
 	border-left: 1px none #E0E0E0;
 	margin: 0px;
+	padding-bottom: 0px;
+	padding-right: 8px;
 }
 .memItemLeft {
 	padding: 1px 0px 0px 8px;
@@ -176,7 +178,7 @@
 	font-size: 12px;
 }
 .memItemRight {
-	padding: 1px 8px 0px 8px;
+	padding: 1px 0px 0px 8px;
 	margin: 4px;
 	border-top-width: 1px;
 	border-right-width: 1px;

Modified: apr/site/trunk/docs/docs/apr-iconv/files.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/files.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/files.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/files.html Mon Feb  7 15:10:17 2005
@@ -3,7 +3,7 @@
 <title>Apache Portable Runtime Iconv Library: File Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindexHL" href="files.html">File&nbsp;List</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>Apache Portable Runtime Iconv Library File List</h1>Here is a list of all documented files with brief descriptions:<table>
   <tr><td class="indexkey">include/<a class="el" href="api__version_8h.html">api_version.h</a> <a href="api__version_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
@@ -12,8 +12,8 @@
   <tr><td class="indexkey">lib/<b>iconv.h</b> <a href="iconv_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">util/<b>iconv_stream.h</b> <a href="iconv__stream_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+<hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-iconv/globals.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/globals.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/globals.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/globals.html Mon Feb  7 15:10:17 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>Apache Portable Runtime Iconv Library: Globals</title>
+<title>Apache Portable Runtime Iconv Library: File Member Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
 <div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
 
@@ -18,8 +18,8 @@
 : <a class="el" href="api__version_8h.html#a6">api_version.h</a><li>API_VERSION_STRING
 : <a class="el" href="api__version_8h.html#a4">api_version.h</a><li>api_version_string()
 : <a class="el" href="api__version_8h.html#a7">api_version.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+<hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-iconv/globals_defs.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/globals_defs.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/globals_defs.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/globals_defs.html Mon Feb  7 15:10:17 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>Apache Portable Runtime Iconv Library: Globals - Defines</title>
+<title>Apache Portable Runtime Iconv Library: File Member Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
 <div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_defs.html">Defines</a></div>
 
@@ -16,8 +16,8 @@
 : <a class="el" href="api__version_8h.html#a1">api_version.h</a><li>API_PATCH_VERSION
 : <a class="el" href="api__version_8h.html#a2">api_version.h</a><li>API_VERSION_STRING
 : <a class="el" href="api__version_8h.html#a4">api_version.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+<hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-iconv/globals_func.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/globals_func.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/globals_func.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/globals_func.html Mon Feb  7 15:10:17 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>Apache Portable Runtime Iconv Library: Globals - Functions</title>
+<title>Apache Portable Runtime Iconv Library: File Member Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
 <div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
 
@@ -12,8 +12,8 @@
 <li>api_version()
 : <a class="el" href="api__version_8h.html#a6">api_version.h</a><li>api_version_string()
 : <a class="el" href="api__version_8h.html#a7">api_version.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+<hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-iconv/iconv_8h-source.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/iconv_8h-source.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/iconv_8h-source.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/iconv_8h-source.html Mon Feb  7 15:10:17 2005
@@ -3,7 +3,7 @@
 <title>Apache Portable Runtime Iconv Library: lib/iconv.h Source File</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>lib/iconv.h</h1><pre class="fragment"><div>00001 <span class="comment">/*-</span>
 00002 <span class="comment"> * Copyright (c) 1999,2000</span>
@@ -47,328 +47,331 @@
 00040 <span class="preprocessor"></span><span class="preprocessor">#define API_USE_BUILTIN_ALIASES </span><span class="comment">/* Use the built-in charset alias table */</span>
 00041 <span class="preprocessor">#else</span>
 00042 <span class="preprocessor"></span><span class="preprocessor">#include "apr_iconv_private.h"</span>  <span class="comment">/* contains ICONV_DEFAULT_PATH */</span>
-00043 <span class="preprocessor">#endif</span>
-00044 <span class="preprocessor"></span>
-00045 <span class="preprocessor">#include &lt;stddef.h&gt;</span>
-00046 
-00047 <span class="preprocessor">#ifdef ICONV_INTERNAL</span>
-00048 <span class="preprocessor"></span>
-00049 <span class="comment">/*</span>
-00050 <span class="comment"> * iconv module types</span>
-00051 <span class="comment"> */</span>
-00052 <span class="preprocessor">#define ICMOD_ANY       0</span>
-00053 <span class="preprocessor"></span><span class="preprocessor">#define ICMOD_LIB       1</span>
-00054 <span class="preprocessor"></span><span class="preprocessor">#define ICMOD_UC_CCS    0x100   </span><span class="comment">/* UC - CCS for CES */</span>
-00055 <span class="preprocessor">#define ICMOD_UC_CES    0x101   </span><span class="comment">/* UC - CES */</span>
-00056 
-00057 <span class="comment">/*</span>
-00058 <span class="comment"> * iconv module flags</span>
-00059 <span class="comment"> */</span>
-00060 <span class="preprocessor">#define ICMODF_LOADED   0x8000</span>
-00061 <span class="preprocessor"></span>
-00062 <span class="comment">/*</span>
-00063 <span class="comment"> * iconv module handler events</span>
-00064 <span class="comment"> */</span>
-00065 <span class="preprocessor">#define ICMODEV_LOAD    1       </span><span class="comment">/* module load. after dependencies resolved */</span>
-00066 <span class="preprocessor">#define ICMODEV_UNLOAD  2       </span><span class="comment">/* module unload */</span>
-00067 <span class="preprocessor">#define ICMODEV_DYN_LOAD    3   </span><span class="comment">/* load dynamic dependencies */</span>
-00068 <span class="preprocessor">#define ICMODEV_DYN_UNLOAD  4   </span><span class="comment">/* unload dynamic dependencies */</span>
-00069 
-00070 <span class="keyword">struct </span>iconv_module_depend {
-00071         <span class="keywordtype">int</span>             md_type;
-00072         <span class="keyword">const</span> <span class="keywordtype">char</span> *    md_name;
-00073         <span class="keyword">const</span> <span class="keywordtype">void</span> *    md_data;
-00074 };
-00075 
-00076 <span class="keyword">struct </span>iconv_module;
-00077 
-00078 <span class="comment">/* _tbl_simple.c table_load_ccs() calls apr_iconv_mod_load(...ctx) */</span>
-00079 
-00080 <span class="keyword">typedef</span> <span class="keywordtype">int</span> iconv_mod_event_t(<span class="keyword">struct</span> iconv_module *, <span class="keywordtype">int</span>, apr_pool_t *ctx);
-00081 
-00082 <span class="keyword">struct </span>iconv_module_desc {
-00083         <span class="keywordtype">int</span>             imd_type;
-00084         iconv_mod_event_t *imd_event;
-00085         <span class="keyword">const</span> <span class="keyword">struct </span>iconv_module_depend *imd_depend;
-00086         <span class="keyword">const</span> <span class="keywordtype">void</span> *    imd_data;
-00087 };
-00088 
-00089 <span class="preprocessor">#define END_ICONV_MODULE_DEPEND  {0, NULL, NULL}</span>
-00090 <span class="preprocessor"></span>
-00091 <span class="preprocessor">#define ICONV_MODULE(type,data) struct iconv_module_desc iconv_module \</span>
-00092 <span class="preprocessor">                                    {(type), (data)}</span>
+00043 <span class="preprocessor">#ifdef _OSD_POSIX</span>
+00044 <span class="preprocessor"></span><span class="preprocessor">#define API_USE_BUILTIN_ALIASES </span><span class="comment">/* Use the built-in charset alias table */</span>
+00045 <span class="preprocessor">#endif</span>
+00046 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+00047 <span class="preprocessor"></span>
+00048 <span class="preprocessor">#include &lt;stddef.h&gt;</span>
+00049 
+00050 <span class="preprocessor">#ifdef ICONV_INTERNAL</span>
+00051 <span class="preprocessor"></span>
+00052 <span class="comment">/*</span>
+00053 <span class="comment"> * iconv module types</span>
+00054 <span class="comment"> */</span>
+00055 <span class="preprocessor">#define ICMOD_ANY       0</span>
+00056 <span class="preprocessor"></span><span class="preprocessor">#define ICMOD_LIB       1</span>
+00057 <span class="preprocessor"></span><span class="preprocessor">#define ICMOD_UC_CCS    0x100   </span><span class="comment">/* UC - CCS for CES */</span>
+00058 <span class="preprocessor">#define ICMOD_UC_CES    0x101   </span><span class="comment">/* UC - CES */</span>
+00059 
+00060 <span class="comment">/*</span>
+00061 <span class="comment"> * iconv module flags</span>
+00062 <span class="comment"> */</span>
+00063 <span class="preprocessor">#define ICMODF_LOADED   0x8000</span>
+00064 <span class="preprocessor"></span>
+00065 <span class="comment">/*</span>
+00066 <span class="comment"> * iconv module handler events</span>
+00067 <span class="comment"> */</span>
+00068 <span class="preprocessor">#define ICMODEV_LOAD    1       </span><span class="comment">/* module load. after dependencies resolved */</span>
+00069 <span class="preprocessor">#define ICMODEV_UNLOAD  2       </span><span class="comment">/* module unload */</span>
+00070 <span class="preprocessor">#define ICMODEV_DYN_LOAD    3   </span><span class="comment">/* load dynamic dependencies */</span>
+00071 <span class="preprocessor">#define ICMODEV_DYN_UNLOAD  4   </span><span class="comment">/* unload dynamic dependencies */</span>
+00072 
+00073 <span class="keyword">struct </span>iconv_module_depend {
+00074         <span class="keywordtype">int</span>             md_type;
+00075         <span class="keyword">const</span> <span class="keywordtype">char</span> *    md_name;
+00076         <span class="keyword">const</span> <span class="keywordtype">void</span> *    md_data;
+00077 };
+00078 
+00079 <span class="keyword">struct </span>iconv_module;
+00080 
+00081 <span class="comment">/* _tbl_simple.c table_load_ccs() calls apr_iconv_mod_load(...ctx) */</span>
+00082 
+00083 <span class="keyword">typedef</span> <span class="keywordtype">int</span> iconv_mod_event_t(<span class="keyword">struct</span> iconv_module *, <span class="keywordtype">int</span>, apr_pool_t *ctx);
+00084 
+00085 <span class="keyword">struct </span>iconv_module_desc {
+00086         <span class="keywordtype">int</span>             imd_type;
+00087         iconv_mod_event_t *imd_event;
+00088         <span class="keyword">const</span> <span class="keyword">struct </span>iconv_module_depend *imd_depend;
+00089         <span class="keyword">const</span> <span class="keywordtype">void</span> *    imd_data;
+00090 };
+00091 
+00092 <span class="preprocessor">#define END_ICONV_MODULE_DEPEND  {0, NULL, NULL}</span>
 00093 <span class="preprocessor"></span>
-00094 <span class="keyword">struct </span>iconv_module {
-00095         <span class="keywordtype">int</span>             im_flags;
-00096         <span class="keywordtype">void</span> *          im_handle;
-00097         <span class="keyword">struct </span>iconv_module_desc *im_desc;
-00098         <span class="keyword">struct </span>iconv_module *im_next;
-00099         <span class="keyword">struct </span>iconv_module *im_deplist;
-00100         <span class="keywordtype">int</span>             im_depcnt;
-00101         <span class="keyword">const</span> <span class="keywordtype">void</span> *    im_methods;
-00102         <span class="keywordtype">void</span> *          im_data;
-00103         <span class="keyword">const</span> <span class="keywordtype">void</span> *    im_depdata;     <span class="comment">/* data if module loaded from dependency */</span>
-00104         <span class="keyword">const</span> <span class="keywordtype">void</span> *    im_args;
-00105 
-00106         <span class="comment">/* This is module-private data. Nothing outside the module</span>
-00107 <span class="comment">           itself may touch it. */</span>
-00108         <span class="keywordtype">void</span> *im_private;
-00109 };
-00110 
-00111 <span class="preprocessor">#define ICONV_MOD_LOAD(mod,ctx) (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_LOAD,ctx)</span>
-00112 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_MOD_UNLOAD(mod,ctx)       (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_UNLOAD,ctx)</span>
-00113 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_MOD_DYN_LOAD(mod,ctx)     (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_DYN_LOAD,ctx)</span>
-00114 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_MOD_DYN_UNLOAD(mod,ctx)   (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_DYN_UNLOAD,ctx)</span>
-00115 <span class="preprocessor"></span>
-00116 <span class="comment">/*</span>
-00117 <span class="comment"> * iconv converter definitions.</span>
-00118 <span class="comment"> */</span>
-00119 <span class="keyword">typedef</span> <span class="keywordtype">int</span> iconv_open_t(<span class="keyword">const</span> <span class="keywordtype">char</span> *, <span class="keyword">const</span> <span class="keywordtype">char</span> *, <span class="keywordtype">void</span> **, apr_pool_t *);
-00120 <span class="keyword">typedef</span> <span class="keywordtype">int</span> iconv_close_t(<span class="keywordtype">void</span> *, apr_pool_t *);
-00121 <span class="keyword">typedef</span> apr_status_t iconv_conv_t(<span class="keywordtype">void</span> *, <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **, apr_size_t *,
-00122         <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **, apr_size_t *, apr_size_t *);
-00123 
-00124 <span class="keyword">struct </span>iconv_converter_desc {
-00125         iconv_open_t *  icd_open;
-00126         iconv_close_t * icd_close;
-00127         iconv_conv_t *  icd_conv;
-00128 };
-00129 
-00130 <span class="keyword">struct </span>iconv_converter {
-00131         <span class="keyword">struct </span>iconv_converter_desc *ic_desc;
-00132         <span class="keywordtype">void</span> *          ic_data;
-00133 };
-00134 
-00135 <span class="comment">/*</span>
-00136 <span class="comment"> * internal data types and functions used by charset conversion modules</span>
-00137 <span class="comment"> */</span>
-00138 
-00139 <span class="preprocessor">#define UCS_CHAR_ZERO_WIDTH_NBSP 0xFEFF</span>
-00140 <span class="preprocessor"></span><span class="preprocessor">#define UCS_CHAR_INVALID         0xFFFE</span>
-00141 <span class="preprocessor"></span><span class="preprocessor">#define UCS_CHAR_NONE            0xFFFF</span>
-00142 <span class="preprocessor"></span>
-00143 <span class="keyword">typedef</span> apr_uint16_t ucs2_t;    <span class="comment">/* Unicode character [D5] */</span>
-00144 <span class="keyword">typedef</span> apr_uint32_t ucs4_t;    <span class="comment">/* Unicode scalar character [D28] */</span>
-00145 <span class="preprocessor">#define ucs_t    ucs4_t</span>
-00146 <span class="preprocessor"></span>
-00147 <span class="comment">/*</span>
-00148 <span class="comment"> * one-level coded character set conversion tables</span>
-00149 <span class="comment"> */</span>
-00150 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00151         apr_uint16_t    data[128];
-00152 } iconv_ccs_convtable_7bit;     <span class="comment">/* 7-bit charset to Unicode */</span>
-00153 
-00154 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00155         apr_uint16_t    data[256];
-00156 } iconv_ccs_convtable_8bit;     <span class="comment">/* 8-bit charset to Unicode */</span>
-00157 
-00158 <span class="comment">/*</span>
-00159 <span class="comment"> * two-level coded character set conversion tables</span>
-00160 <span class="comment"> */</span>
-00161 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00162         <span class="keyword">const</span> iconv_ccs_convtable_7bit  *data[128];
-00163 } iconv_ccs_convtable_14bit;    <span class="comment">/* 14-bit charset to Unicode */</span>
-00164 
-00165 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00166         <span class="keyword">const</span> iconv_ccs_convtable_8bit  *data[256];
-00167 } iconv_ccs_convtable_16bit;    <span class="comment">/* 16-bit charset to Unicode;</span>
-00168 <span class="comment">                                 * Unicode to any charset */</span>
-00169 
-00170 <span class="comment">/*</span>
-00171 <span class="comment"> * abstract coded character set conversion table</span>
-00172 <span class="comment"> */</span>
-00173 <span class="keyword">typedef</span> <span class="keyword">union </span>{
-00174         iconv_ccs_convtable_7bit        _7bit;
-00175         iconv_ccs_convtable_8bit        _8bit;
-00176         iconv_ccs_convtable_14bit       _14bit;
-00177         iconv_ccs_convtable_16bit       _16bit;
-00178 } iconv_ccs_convtable;
-00179 
-00180 <span class="comment">/*</span>
-00181 <span class="comment"> * function for table-driven conversion</span>
-00182 <span class="comment"> */</span>
-00183 <span class="keyword">typedef</span> ucs2_t iconv_ccs_converter_t (ucs2_t ch);
-00184 
-00185 <span class="comment">/*</span>
-00186 <span class="comment"> * charset conversion module descriptor</span>
-00187 <span class="comment"> */</span>
-00188 <span class="keyword">struct </span>iconv_ccs_desc {
-00189         <span class="keyword">const</span> <span class="keywordtype">char</span> * <span class="keyword">const</span> *            names;
-00190         <span class="keywordtype">int</span>                             nbits;
-00191         <span class="keyword">const</span> iconv_ccs_convtable *     from_ucs;
-00192         <span class="keyword">const</span> iconv_ccs_convtable *     to_ucs;
-00193         iconv_ccs_converter_t *         convert_from_ucs;
-00194         iconv_ccs_converter_t *         convert_to_ucs;
-00195 };
-00196 
-00197 <span class="comment">/*</span>
-00198 <span class="comment"> * inline functions for use in charset conversion modules</span>
-00199 <span class="comment"> */</span>
-00200 <span class="keyword">static</span> APR_INLINE ucs2_t
-00201 iconv_ccs_convert_7bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
-00202 {
-00203         <span class="keywordflow">return</span> ch &amp; 0x80 ? UCS_CHAR_INVALID : table-&gt;_7bit.data[ch];
-00204 }
-00205 
-00206 <span class="keyword">static</span> APR_INLINE ucs2_t
-00207 iconv_ccs_convert_8bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
-00208 {
-00209         <span class="keywordflow">return</span> table-&gt;_8bit.data[ch];
-00210 }
-00211 
-00212 <span class="keyword">static</span> APR_INLINE ucs2_t
-00213 iconv_ccs_convert_14bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
-00214 {
-00215         <span class="keyword">const</span> iconv_ccs_convtable_7bit *sub_table;
-00216 
-00217         sub_table =  ch &amp; 0x8080 ? NULL : table-&gt;_14bit.data[ch &gt;&gt; 8];
-00218         <span class="keywordflow">return</span> sub_table ? sub_table-&gt;data[ch &amp; 0x7F] : UCS_CHAR_INVALID;
-00219 }
-00220 
-00221 <span class="keyword">static</span> APR_INLINE ucs2_t
-00222 iconv_ccs_convert_16bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
-00223 {
-00224         <span class="keyword">const</span> iconv_ccs_convtable_8bit *sub_table;
-00225 
-00226         sub_table = table-&gt;_16bit.data[ch &gt;&gt; 8];
-00227         <span class="keywordflow">return</span> sub_table ? sub_table-&gt;data[ch &amp; 0xFF] : UCS_CHAR_INVALID;
-00228 }
-00229 
-00230 <span class="preprocessor">#define ICONV_CCS_CONVERT_FROM_UCS(ccsd, ch) \</span>
-00231 <span class="preprocessor">        ((ccsd)-&gt;convert_from_ucs(ch))</span>
-00232 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_CCS_CONVERT_TO_UCS(ccsd, ch) \</span>
-00233 <span class="preprocessor">        ((ccsd)-&gt;convert_to_ucs(ch))</span>
-00234 <span class="preprocessor"></span>
-00235 <span class="comment">/*</span>
-00236 <span class="comment"> * generic character encoding schemes and functions</span>
-00237 <span class="comment"> */</span>
-00238 <span class="keyword">struct </span>iconv_ces;
-00239 
-00240 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_open_t(<span class="keyword">struct</span> iconv_ces *, apr_pool_t *);
-00241 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_close_t(<span class="keyword">struct</span> iconv_ces *);
-00242 <span class="keyword">typedef</span> <span class="keywordtype">void</span> iconv_ces_reset_t(<span class="keyword">struct</span> iconv_ces *);
-00243 <span class="keyword">typedef</span> <span class="keyword">const</span> <span class="keywordtype">char</span> * <span class="keyword">const</span> *iconv_ces_names_t(<span class="keyword">struct</span> iconv_ces *);
-00244 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_nbits_t(<span class="keyword">struct</span> iconv_ces *);
-00245 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_nbytes_t(<span class="keyword">struct</span> iconv_ces *);
-00246 
-00247 <span class="keyword">typedef</span> apr_ssize_t iconv_ces_convert_from_ucs_t
-00248     (<span class="keyword">struct </span>iconv_ces *data, ucs_t in,
-00249     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **outbuf, apr_size_t *outbytesleft);
-00250 
-00251 <span class="keyword">typedef</span> ucs_t iconv_ces_convert_to_ucs_t
-00252     (<span class="keyword">struct </span>iconv_ces *data,
-00253     <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **inbuf, apr_size_t *inbytesleft);
-00254 
-00255 <span class="keyword">struct </span>iconv_ces_desc {
-00256         iconv_ces_open_t *      open;
-00257         iconv_ces_close_t *     close;
-00258         iconv_ces_reset_t *     reset;
-00259         iconv_ces_names_t *     names;
-00260         iconv_ces_nbits_t *     nbits;
-00261         iconv_ces_nbytes_t *    nbytes;
-00262         iconv_ces_convert_from_ucs_t * convert_from_ucs;
-00263         iconv_ces_convert_to_ucs_t * convert_to_ucs;
-00264         <span class="keyword">const</span> <span class="keywordtype">void</span> *data;
-00265 };
-00266 
-00267 <span class="keyword">struct </span>iconv_ces {
-00268         <span class="keyword">struct </span>iconv_ces_desc * desc;
-00269         <span class="keywordtype">void</span> *                  data;
-00270         <span class="keyword">struct </span>iconv_module *   mod;
-00271 };
-00272 
-00273 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_open(const <span class="keywordtype">char</span> *ces_name, struct iconv_ces **cespp, apr_pool_t *ctx);
-00274 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx);
-00275 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_open_func(struct iconv_ces *ces, apr_pool_t *ctx);
-00276 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_close_func(struct iconv_ces *ces);
-00277 API_DECLARE_NONSTD(<span class="keywordtype">void</span>) apr_iconv_ces_reset_func(struct iconv_ces *ces);
-00278 API_DECLARE_NONSTD(<span class="keywordtype">void</span>) apr_iconv_ces_no_func(struct iconv_ces *ces);
-00279 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_nbits7(struct iconv_ces *ces);
-00280 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_nbits8(struct iconv_ces *ces);
-00281 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_zero(struct iconv_ces *ces);
-00282 
-00283 <span class="comment">/* Safe for _NONSTD APIs since the C caller pops the stack and the</span>
-00284 <span class="comment"> * apr_pool_t *cxt arg is simply ignored:</span>
-00285 <span class="comment"> */</span>
-00286 #define apr_iconv_ces_open_zero (iconv_ces_open_t*)apr_iconv_ces_zero
-00287 
-00288 #define iconv_char32bit(ch)     ((ch) &amp; 0xFFFF0000)
-00289 
-00290 #define ICONV_CES_OPEN(ces,ctx) (ces)-&gt;desc-&gt;open(ces,ctx)
-00291 #define ICONV_CES_CLOSE(ces)    (ces)-&gt;desc-&gt;close(ces)
-00292 #define ICONV_CES_RESET(ces)    (ces)-&gt;desc-&gt;reset(ces)
-00293 #define ICONV_CES_CONVERT_FROM_UCS(cesd, in, outbuf, outbytes) \
-00294             ((cesd)-&gt;desc-&gt;convert_from_ucs((cesd), (in), (outbuf), (outbytes)))
-00295 #define ICONV_CES_CONVERT_TO_UCS(cesd, inbuf, inbytes) \
-00296             ((cesd)-&gt;desc-&gt;convert_to_ucs((cesd), (inbuf), (inbytes)))
-00297 
-00298 #define ICONV_CES_DRIVER_DECL(name) \
-00299                 iconv_ces_open_t iconv_##name##_open; \
-00300                 iconv_ces_close_t iconv_##name##_close; \
-00301                 iconv_ces_reset_t iconv_##name##_reset; \
-00302                 iconv_ces_nbits_t iconv_##name##_nbits; \
-00303                 iconv_ces_convert_from_ucs_t iconv_##name##_convert_from_ucs; \
-00304                 iconv_ces_convert_to_ucs_t iconv_##name##_convert_to_ucs
-00305 
-00306 <span class="comment">/*</span>
-00307 <span class="comment"> ************************************************</span>
-00308 <span class="comment"> * EUC character encoding schemes and functions *</span>
-00309 <span class="comment"> ************************************************</span>
-00310 <span class="comment"> */</span>
-00311 
-00312 typedef struct iconv_ces_euc_ccs {
-00313         <span class="keyword">const</span> <span class="keywordtype">char</span>      *prefix;
-00314         apr_size_t              prefixlen;
-00315 } iconv_ces_euc_ccs_t;
-00316 
-00317 ICONV_CES_DRIVER_DECL(euc);
-00318 
-00319 <span class="comment">/*</span>
-00320 <span class="comment"> * ISO-2022 character encoding schemes and functions</span>
-00321 <span class="comment"> */</span>
-00322 <span class="keyword">enum</span> { ICONV_SHIFT_SI = 0, ICONV_SHIFT_SO, ICONV_SHIFT_SS2, ICONV_SHIFT_SS3 };
-00323 
-00324 <span class="keyword">typedef</span> <span class="keyword">struct </span>iconv_ces_iso2022_ccs {
-00325         <span class="keywordtype">int</span>             shift;
-00326         <span class="keyword">const</span> <span class="keywordtype">char</span> *    designator;
-00327         apr_size_t              designatorlen;
-00328 } iconv_ces_iso2022_ccs_t;
-00329 
-00330 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00331         <span class="keyword">const</span> <span class="keywordtype">int</span> *     shift_tab;
-00332         <span class="keywordtype">int</span>             nccs;
-00333         <span class="keyword">const</span> <span class="keyword">struct </span>iconv_ces_iso2022_ccs *ccs;
-00334 } iconv_ces_iso2022_data;
-00335 
-00336 ICONV_CES_DRIVER_DECL(iso2022);
-00337 
+00094 <span class="preprocessor">#define ICONV_MODULE(type,data) struct iconv_module_desc iconv_module \</span>
+00095 <span class="preprocessor">                                    {(type), (data)}</span>
+00096 <span class="preprocessor"></span>
+00097 <span class="keyword">struct </span>iconv_module {
+00098         <span class="keywordtype">int</span>             im_flags;
+00099         <span class="keywordtype">void</span> *          im_handle;
+00100         <span class="keyword">struct </span>iconv_module_desc *im_desc;
+00101         <span class="keyword">struct </span>iconv_module *im_next;
+00102         <span class="keyword">struct </span>iconv_module *im_deplist;
+00103         <span class="keywordtype">int</span>             im_depcnt;
+00104         <span class="keyword">const</span> <span class="keywordtype">void</span> *    im_methods;
+00105         <span class="keywordtype">void</span> *          im_data;
+00106         <span class="keyword">const</span> <span class="keywordtype">void</span> *    im_depdata;     <span class="comment">/* data if module loaded from dependency */</span>
+00107         <span class="keyword">const</span> <span class="keywordtype">void</span> *    im_args;
+00108 
+00109         <span class="comment">/* This is module-private data. Nothing outside the module</span>
+00110 <span class="comment">           itself may touch it. */</span>
+00111         <span class="keywordtype">void</span> *im_private;
+00112 };
+00113 
+00114 <span class="preprocessor">#define ICONV_MOD_LOAD(mod,ctx) (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_LOAD,ctx)</span>
+00115 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_MOD_UNLOAD(mod,ctx)       (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_UNLOAD,ctx)</span>
+00116 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_MOD_DYN_LOAD(mod,ctx)     (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_DYN_LOAD,ctx)</span>
+00117 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_MOD_DYN_UNLOAD(mod,ctx)   (mod)-&gt;im_desc-&gt;imd_event(mod, ICMODEV_DYN_UNLOAD,ctx)</span>
+00118 <span class="preprocessor"></span>
+00119 <span class="comment">/*</span>
+00120 <span class="comment"> * iconv converter definitions.</span>
+00121 <span class="comment"> */</span>
+00122 <span class="keyword">typedef</span> <span class="keywordtype">int</span> iconv_open_t(<span class="keyword">const</span> <span class="keywordtype">char</span> *, <span class="keyword">const</span> <span class="keywordtype">char</span> *, <span class="keywordtype">void</span> **, apr_pool_t *);
+00123 <span class="keyword">typedef</span> <span class="keywordtype">int</span> iconv_close_t(<span class="keywordtype">void</span> *, apr_pool_t *);
+00124 <span class="keyword">typedef</span> apr_status_t iconv_conv_t(<span class="keywordtype">void</span> *, <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **, apr_size_t *,
+00125         <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **, apr_size_t *, apr_size_t *);
+00126 
+00127 <span class="keyword">struct </span>iconv_converter_desc {
+00128         iconv_open_t *  icd_open;
+00129         iconv_close_t * icd_close;
+00130         iconv_conv_t *  icd_conv;
+00131 };
+00132 
+00133 <span class="keyword">struct </span>iconv_converter {
+00134         <span class="keyword">struct </span>iconv_converter_desc *ic_desc;
+00135         <span class="keywordtype">void</span> *          ic_data;
+00136 };
+00137 
+00138 <span class="comment">/*</span>
+00139 <span class="comment"> * internal data types and functions used by charset conversion modules</span>
+00140 <span class="comment"> */</span>
+00141 
+00142 <span class="preprocessor">#define UCS_CHAR_ZERO_WIDTH_NBSP 0xFEFF</span>
+00143 <span class="preprocessor"></span><span class="preprocessor">#define UCS_CHAR_INVALID         0xFFFE</span>
+00144 <span class="preprocessor"></span><span class="preprocessor">#define UCS_CHAR_NONE            0xFFFF</span>
+00145 <span class="preprocessor"></span>
+00146 <span class="keyword">typedef</span> apr_uint16_t ucs2_t;    <span class="comment">/* Unicode character [D5] */</span>
+00147 <span class="keyword">typedef</span> apr_uint32_t ucs4_t;    <span class="comment">/* Unicode scalar character [D28] */</span>
+00148 <span class="preprocessor">#define ucs_t    ucs4_t</span>
+00149 <span class="preprocessor"></span>
+00150 <span class="comment">/*</span>
+00151 <span class="comment"> * one-level coded character set conversion tables</span>
+00152 <span class="comment"> */</span>
+00153 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+00154         apr_uint16_t    data[128];
+00155 } iconv_ccs_convtable_7bit;     <span class="comment">/* 7-bit charset to Unicode */</span>
+00156 
+00157 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+00158         apr_uint16_t    data[256];
+00159 } iconv_ccs_convtable_8bit;     <span class="comment">/* 8-bit charset to Unicode */</span>
+00160 
+00161 <span class="comment">/*</span>
+00162 <span class="comment"> * two-level coded character set conversion tables</span>
+00163 <span class="comment"> */</span>
+00164 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+00165         <span class="keyword">const</span> iconv_ccs_convtable_7bit  *data[128];
+00166 } iconv_ccs_convtable_14bit;    <span class="comment">/* 14-bit charset to Unicode */</span>
+00167 
+00168 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+00169         <span class="keyword">const</span> iconv_ccs_convtable_8bit  *data[256];
+00170 } iconv_ccs_convtable_16bit;    <span class="comment">/* 16-bit charset to Unicode;</span>
+00171 <span class="comment">                                 * Unicode to any charset */</span>
+00172 
+00173 <span class="comment">/*</span>
+00174 <span class="comment"> * abstract coded character set conversion table</span>
+00175 <span class="comment"> */</span>
+00176 <span class="keyword">typedef</span> <span class="keyword">union </span>{
+00177         iconv_ccs_convtable_7bit        _7bit;
+00178         iconv_ccs_convtable_8bit        _8bit;
+00179         iconv_ccs_convtable_14bit       _14bit;
+00180         iconv_ccs_convtable_16bit       _16bit;
+00181 } iconv_ccs_convtable;
+00182 
+00183 <span class="comment">/*</span>
+00184 <span class="comment"> * function for table-driven conversion</span>
+00185 <span class="comment"> */</span>
+00186 <span class="keyword">typedef</span> ucs2_t iconv_ccs_converter_t (ucs2_t ch);
+00187 
+00188 <span class="comment">/*</span>
+00189 <span class="comment"> * charset conversion module descriptor</span>
+00190 <span class="comment"> */</span>
+00191 <span class="keyword">struct </span>iconv_ccs_desc {
+00192         <span class="keyword">const</span> <span class="keywordtype">char</span> * <span class="keyword">const</span> *            names;
+00193         <span class="keywordtype">int</span>                             nbits;
+00194         <span class="keyword">const</span> iconv_ccs_convtable *     from_ucs;
+00195         <span class="keyword">const</span> iconv_ccs_convtable *     to_ucs;
+00196         iconv_ccs_converter_t *         convert_from_ucs;
+00197         iconv_ccs_converter_t *         convert_to_ucs;
+00198 };
+00199 
+00200 <span class="comment">/*</span>
+00201 <span class="comment"> * inline functions for use in charset conversion modules</span>
+00202 <span class="comment"> */</span>
+00203 <span class="keyword">static</span> APR_INLINE ucs2_t
+00204 iconv_ccs_convert_7bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
+00205 {
+00206         <span class="keywordflow">return</span> ch &amp; 0x80 ? UCS_CHAR_INVALID : table-&gt;_7bit.data[ch];
+00207 }
+00208 
+00209 <span class="keyword">static</span> APR_INLINE ucs2_t
+00210 iconv_ccs_convert_8bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
+00211 {
+00212         <span class="keywordflow">return</span> table-&gt;_8bit.data[ch];
+00213 }
+00214 
+00215 <span class="keyword">static</span> APR_INLINE ucs2_t
+00216 iconv_ccs_convert_14bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
+00217 {
+00218         <span class="keyword">const</span> iconv_ccs_convtable_7bit *sub_table;
+00219 
+00220         sub_table =  ch &amp; 0x8080 ? NULL : table-&gt;_14bit.data[ch &gt;&gt; 8];
+00221         <span class="keywordflow">return</span> sub_table ? sub_table-&gt;data[ch &amp; 0x7F] : UCS_CHAR_INVALID;
+00222 }
+00223 
+00224 <span class="keyword">static</span> APR_INLINE ucs2_t
+00225 iconv_ccs_convert_16bit(<span class="keyword">const</span> iconv_ccs_convtable *table, ucs2_t ch)
+00226 {
+00227         <span class="keyword">const</span> iconv_ccs_convtable_8bit *sub_table;
+00228 
+00229         sub_table = table-&gt;_16bit.data[ch &gt;&gt; 8];
+00230         <span class="keywordflow">return</span> sub_table ? sub_table-&gt;data[ch &amp; 0xFF] : UCS_CHAR_INVALID;
+00231 }
+00232 
+00233 <span class="preprocessor">#define ICONV_CCS_CONVERT_FROM_UCS(ccsd, ch) \</span>
+00234 <span class="preprocessor">        ((ccsd)-&gt;convert_from_ucs(ch))</span>
+00235 <span class="preprocessor"></span><span class="preprocessor">#define ICONV_CCS_CONVERT_TO_UCS(ccsd, ch) \</span>
+00236 <span class="preprocessor">        ((ccsd)-&gt;convert_to_ucs(ch))</span>
+00237 <span class="preprocessor"></span>
+00238 <span class="comment">/*</span>
+00239 <span class="comment"> * generic character encoding schemes and functions</span>
+00240 <span class="comment"> */</span>
+00241 <span class="keyword">struct </span>iconv_ces;
+00242 
+00243 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_open_t(<span class="keyword">struct</span> iconv_ces *, apr_pool_t *);
+00244 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_close_t(<span class="keyword">struct</span> iconv_ces *);
+00245 <span class="keyword">typedef</span> <span class="keywordtype">void</span> iconv_ces_reset_t(<span class="keyword">struct</span> iconv_ces *);
+00246 <span class="keyword">typedef</span> <span class="keyword">const</span> <span class="keywordtype">char</span> * <span class="keyword">const</span> *iconv_ces_names_t(<span class="keyword">struct</span> iconv_ces *);
+00247 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_nbits_t(<span class="keyword">struct</span> iconv_ces *);
+00248 <span class="keyword">typedef</span> <span class="keywordtype">int</span>  iconv_ces_nbytes_t(<span class="keyword">struct</span> iconv_ces *);
+00249 
+00250 <span class="keyword">typedef</span> apr_ssize_t iconv_ces_convert_from_ucs_t
+00251     (<span class="keyword">struct </span>iconv_ces *data, ucs_t in,
+00252     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **outbuf, apr_size_t *outbytesleft);
+00253 
+00254 <span class="keyword">typedef</span> ucs_t iconv_ces_convert_to_ucs_t
+00255     (<span class="keyword">struct </span>iconv_ces *data,
+00256     <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **inbuf, apr_size_t *inbytesleft);
+00257 
+00258 <span class="keyword">struct </span>iconv_ces_desc {
+00259         iconv_ces_open_t *      open;
+00260         iconv_ces_close_t *     close;
+00261         iconv_ces_reset_t *     reset;
+00262         iconv_ces_names_t *     names;
+00263         iconv_ces_nbits_t *     nbits;
+00264         iconv_ces_nbytes_t *    nbytes;
+00265         iconv_ces_convert_from_ucs_t * convert_from_ucs;
+00266         iconv_ces_convert_to_ucs_t * convert_to_ucs;
+00267         <span class="keyword">const</span> <span class="keywordtype">void</span> *data;
+00268 };
+00269 
+00270 <span class="keyword">struct </span>iconv_ces {
+00271         <span class="keyword">struct </span>iconv_ces_desc * desc;
+00272         <span class="keywordtype">void</span> *                  data;
+00273         <span class="keyword">struct </span>iconv_module *   mod;
+00274 };
+00275 
+00276 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_open(const <span class="keywordtype">char</span> *ces_name, struct iconv_ces **cespp, apr_pool_t *ctx);
+00277 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_close(struct iconv_ces *ces, apr_pool_t *ctx);
+00278 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_open_func(struct iconv_ces *ces, apr_pool_t *ctx);
+00279 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_close_func(struct iconv_ces *ces);
+00280 API_DECLARE_NONSTD(<span class="keywordtype">void</span>) apr_iconv_ces_reset_func(struct iconv_ces *ces);
+00281 API_DECLARE_NONSTD(<span class="keywordtype">void</span>) apr_iconv_ces_no_func(struct iconv_ces *ces);
+00282 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_nbits7(struct iconv_ces *ces);
+00283 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_nbits8(struct iconv_ces *ces);
+00284 API_DECLARE_NONSTD(<span class="keywordtype">int</span>)  apr_iconv_ces_zero(struct iconv_ces *ces);
+00285 
+00286 <span class="comment">/* Safe for _NONSTD APIs since the C caller pops the stack and the</span>
+00287 <span class="comment"> * apr_pool_t *cxt arg is simply ignored:</span>
+00288 <span class="comment"> */</span>
+00289 #define apr_iconv_ces_open_zero (iconv_ces_open_t*)apr_iconv_ces_zero
+00290 
+00291 #define iconv_char32bit(ch)     ((ch) &amp; 0xFFFF0000)
+00292 
+00293 #define ICONV_CES_OPEN(ces,ctx) (ces)-&gt;desc-&gt;open(ces,ctx)
+00294 #define ICONV_CES_CLOSE(ces)    (ces)-&gt;desc-&gt;close(ces)
+00295 #define ICONV_CES_RESET(ces)    (ces)-&gt;desc-&gt;reset(ces)
+00296 #define ICONV_CES_CONVERT_FROM_UCS(cesd, in, outbuf, outbytes) \
+00297             ((cesd)-&gt;desc-&gt;convert_from_ucs((cesd), (in), (outbuf), (outbytes)))
+00298 #define ICONV_CES_CONVERT_TO_UCS(cesd, inbuf, inbytes) \
+00299             ((cesd)-&gt;desc-&gt;convert_to_ucs((cesd), (inbuf), (inbytes)))
+00300 
+00301 #define ICONV_CES_DRIVER_DECL(name) \
+00302                 iconv_ces_open_t iconv_##name##_open; \
+00303                 iconv_ces_close_t iconv_##name##_close; \
+00304                 iconv_ces_reset_t iconv_##name##_reset; \
+00305                 iconv_ces_nbits_t iconv_##name##_nbits; \
+00306                 iconv_ces_convert_from_ucs_t iconv_##name##_convert_from_ucs; \
+00307                 iconv_ces_convert_to_ucs_t iconv_##name##_convert_to_ucs
+00308 
+00309 <span class="comment">/*</span>
+00310 <span class="comment"> ************************************************</span>
+00311 <span class="comment"> * EUC character encoding schemes and functions *</span>
+00312 <span class="comment"> ************************************************</span>
+00313 <span class="comment"> */</span>
+00314 
+00315 typedef struct iconv_ces_euc_ccs {
+00316         <span class="keyword">const</span> <span class="keywordtype">char</span>      *prefix;
+00317         apr_size_t              prefixlen;
+00318 } iconv_ces_euc_ccs_t;
+00319 
+00320 ICONV_CES_DRIVER_DECL(euc);
+00321 
+00322 <span class="comment">/*</span>
+00323 <span class="comment"> * ISO-2022 character encoding schemes and functions</span>
+00324 <span class="comment"> */</span>
+00325 <span class="keyword">enum</span> { ICONV_SHIFT_SI = 0, ICONV_SHIFT_SO, ICONV_SHIFT_SS2, ICONV_SHIFT_SS3 };
+00326 
+00327 <span class="keyword">typedef</span> <span class="keyword">struct </span>iconv_ces_iso2022_ccs {
+00328         <span class="keywordtype">int</span>             shift;
+00329         <span class="keyword">const</span> <span class="keywordtype">char</span> *    designator;
+00330         apr_size_t              designatorlen;
+00331 } iconv_ces_iso2022_ccs_t;
+00332 
+00333 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+00334         <span class="keyword">const</span> <span class="keywordtype">int</span> *     shift_tab;
+00335         <span class="keywordtype">int</span>             nccs;
+00336         <span class="keyword">const</span> <span class="keyword">struct </span>iconv_ces_iso2022_ccs *ccs;
+00337 } iconv_ces_iso2022_data;
 00338 
-00339 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_mod_load(const <span class="keywordtype">char</span> *, <span class="keywordtype">int</span>, const <span class="keywordtype">void</span> *, struct iconv_module **, apr_pool_t *);
-00340 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_mod_unload(struct iconv_module *,apr_pool_t *ctx);
-00341 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_mod_noevent(struct iconv_module *mod, <span class="keywordtype">int</span> event, apr_pool_t *ctx);
-00342 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_ccs_event(struct iconv_module *mod, <span class="keywordtype">int</span> event, apr_pool_t *ctx);
-00343 
-00344 <span class="keywordtype">int</span>  iconv_malloc(apr_size_t size, <span class="keywordtype">void</span> **pp);
-00345 
-00346 extern struct iconv_converter_desc iconv_uc_desc;
-00347 
+00339 ICONV_CES_DRIVER_DECL(iso2022);
+00340 
+00341 
+00342 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_mod_load(const <span class="keywordtype">char</span> *, <span class="keywordtype">int</span>, const <span class="keywordtype">void</span> *, struct iconv_module **, apr_pool_t *);
+00343 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_mod_unload(struct iconv_module *,apr_pool_t *ctx);
+00344 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_mod_noevent(struct iconv_module *mod, <span class="keywordtype">int</span> event, apr_pool_t *ctx);
+00345 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_ccs_event(struct iconv_module *mod, <span class="keywordtype">int</span> event, apr_pool_t *ctx);
+00346 
+00347 <span class="keywordtype">int</span>  iconv_malloc(apr_size_t size, <span class="keywordtype">void</span> **pp);
 00348 
-00349 API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx);
-00350 API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_close(struct iconv_ces *ces);
-00351 API_DECLARE_NONSTD(apr_ssize_t)  apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in,        <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **outbuf, apr_size_t *outbytesleft);
-00352 API_DECLARE_NONSTD(ucs_t)  apr_iconv_euc_convert_to_ucs(struct iconv_ces *ces, const <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **inbuf, apr_size_t *inbytesleft);
-00353 
-00354 API_DECLARE_NONSTD(apr_status_t) apr_iconv_iso2022_open(struct iconv_ces *ces, apr_pool_t *ctx);
-00355 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_iso2022_close(struct iconv_ces *ces);
-00356 API_DECLARE_NONSTD(<span class="keywordtype">void</span>) apr_iconv_iso2022_reset(struct iconv_ces *ces);
-00357 API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **outbuf, apr_size_t *outbytesleft);
-00358 API_DECLARE_NONSTD(ucs_t) apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **inbuf, apr_size_t *inbytesleft);
-00359 
-00360 #endif <span class="comment">/* ICONV_INTERNAL */</span>
-00361 
-00362 #endif <span class="comment">/* _ICONV_H_ */</span>
-</div></pre><hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+00349 extern struct iconv_converter_desc iconv_uc_desc;
+00350 
+00351 
+00352 API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx);
+00353 API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_close(struct iconv_ces *ces);
+00354 API_DECLARE_NONSTD(apr_ssize_t)  apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in,        <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **outbuf, apr_size_t *outbytesleft);
+00355 API_DECLARE_NONSTD(ucs_t)  apr_iconv_euc_convert_to_ucs(struct iconv_ces *ces, const <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **inbuf, apr_size_t *inbytesleft);
+00356 
+00357 API_DECLARE_NONSTD(apr_status_t) apr_iconv_iso2022_open(struct iconv_ces *ces, apr_pool_t *ctx);
+00358 API_DECLARE_NONSTD(<span class="keywordtype">int</span>) apr_iconv_iso2022_close(struct iconv_ces *ces);
+00359 API_DECLARE_NONSTD(<span class="keywordtype">void</span>) apr_iconv_iso2022_reset(struct iconv_ces *ces);
+00360 API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **outbuf, apr_size_t *outbytesleft);
+00361 API_DECLARE_NONSTD(ucs_t) apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> **inbuf, apr_size_t *inbytesleft);
+00362 
+00363 #endif <span class="comment">/* ICONV_INTERNAL */</span>
+00364 
+00365 #endif <span class="comment">/* _ICONV_H_ */</span>
+</div></pre><hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-iconv/iconv__stream_8h-source.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/iconv__stream_8h-source.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/iconv__stream_8h-source.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/iconv__stream_8h-source.html Mon Feb  7 15:10:17 2005
@@ -3,7 +3,7 @@
 <title>Apache Portable Runtime Iconv Library: util/iconv_stream.h Source File</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>util/iconv_stream.h</h1><pre class="fragment"><div>00001 <span class="preprocessor">#ifndef _ICONV_STREAM_H_</span>
 00002 <span class="preprocessor"></span><span class="preprocessor">#define _ICONV_STREAM_H_</span>
@@ -34,8 +34,8 @@
 00027 apr_ssize_t iconv_bwrite(<span class="keywordtype">void</span> *stream, <span class="keyword">const</span> <span class="keywordtype">void</span> *buf, apr_size_t nbytes);
 00028 
 00029 <span class="preprocessor">#endif </span><span class="comment">/*_ICONV_STREAM_H_*/</span>
-</div></pre><hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+</div></pre><hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-iconv/index.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-iconv/index.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-iconv/index.html (original)
+++ apr/site/trunk/docs/docs/apr-iconv/index.html Mon Feb  7 15:10:17 2005
@@ -3,12 +3,12 @@
 <title>Apache Portable Runtime Iconv Library: Main Page</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>Apache Portable Runtime Iconv Library Documentation</h1>
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:33:08 2004 for Apache Portable Runtime Iconv Library by
+<hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:20:47 2005 for Apache Portable Runtime Iconv Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-util/abts_8h-source.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-util/abts_8h-source.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-util/abts_8h-source.html (original)
+++ apr/site/trunk/docs/docs/apr-util/abts_8h-source.html Mon Feb  7 15:10:17 2005
@@ -3,7 +3,7 @@
 <title>Apache Portable Runtime Utility Library: test/abts.h Source File</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="namespaces.html">Namespace List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>test/abts.h</h1><pre class="fragment"><div>00001 <span class="comment">/* Copyright 2000-2004 Ryan Bloom</span>
 00002 <span class="comment"> *</span>
@@ -103,8 +103,8 @@
 00096 <span class="preprocessor"></span>}
 00097 <span class="preprocessor">#endif</span>
 00098 <span class="preprocessor"></span>
-</div></pre><hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:35:50 2004 for Apache Portable Runtime Utility Library by
+</div></pre><hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:19:18 2005 for Apache Portable Runtime Utility Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-util/abts__tests_8h-source.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-util/abts__tests_8h-source.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-util/abts__tests_8h-source.html (original)
+++ apr/site/trunk/docs/docs/apr-util/abts__tests_8h-source.html Mon Feb  7 15:10:17 2005
@@ -3,42 +3,46 @@
 <title>Apache Portable Runtime Utility Library: test/abts_tests.h Source File</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="namespaces.html">Namespace List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>test/abts_tests.h</h1><pre class="fragment"><div>00001 <span class="comment">/* Copyright 2000-2004 The Apache Software Foundation</span>
-00002 <span class="comment"> *</span>
-00003 <span class="comment"> * Licensed under the Apache License, Version 2.0 (the "License");</span>
-00004 <span class="comment"> * you may not use this file except in compliance with the License.</span>
-00005 <span class="comment"> * You may obtain a copy of the License at</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> *     http://www.apache.org/licenses/LICENSE-2.0</span>
-00008 <span class="comment"> *</span>
-00009 <span class="comment"> * Unless required by applicable law or agreed to in writing, software</span>
-00010 <span class="comment"> * distributed under the License is distributed on an "AS IS" BASIS,</span>
-00011 <span class="comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</span>
-00012 <span class="comment"> * See the License for the specific language governing permissions and</span>
-00013 <span class="comment"> * limitations under the License.</span>
-00014 <span class="comment"> */</span>
-00015 
-00016 <span class="preprocessor">#ifndef APR_TEST_INCLUDES</span>
-00017 <span class="preprocessor"></span><span class="preprocessor">#define APR_TEST_INCLUDES</span>
-00018 <span class="preprocessor"></span>
-00019 <span class="preprocessor">#include "abts.h"</span>
-00020 <span class="preprocessor">#include "testutil.h"</span>
-00021 
-00022 <span class="keyword">const</span> <span class="keyword">struct </span>testlist {
-00023     abts_suite *(*func)(abts_suite *suite);
-00024 } alltests[] = {
-00025     {teststrmatch},
-00026     {testuri},
-00027     {testuuid},
-00028     {testbuckets},
-00029     {testpass}
-00030 };
-00031 
-00032 <span class="preprocessor">#endif </span><span class="comment">/* APR_TEST_INCLUDES */</span>
-</div></pre><hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:35:50 2004 for Apache Portable Runtime Utility Library by
+<h1>test/abts_tests.h</h1><pre class="fragment"><div>00001 <span class="comment">/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as</span>
+00002 <span class="comment"> * applicable.</span>
+00003 <span class="comment"> *</span>
+00004 <span class="comment"> * Licensed under the Apache License, Version 2.0 (the "License");</span>
+00005 <span class="comment"> * you may not use this file except in compliance with the License.</span>
+00006 <span class="comment"> * You may obtain a copy of the License at</span>
+00007 <span class="comment"> *</span>
+00008 <span class="comment"> *     http://www.apache.org/licenses/LICENSE-2.0</span>
+00009 <span class="comment"> *</span>
+00010 <span class="comment"> * Unless required by applicable law or agreed to in writing, software</span>
+00011 <span class="comment"> * distributed under the License is distributed on an "AS IS" BASIS,</span>
+00012 <span class="comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</span>
+00013 <span class="comment"> * See the License for the specific language governing permissions and</span>
+00014 <span class="comment"> * limitations under the License.</span>
+00015 <span class="comment"> */</span>
+00016 
+00017 <span class="preprocessor">#ifndef APR_TEST_INCLUDES</span>
+00018 <span class="preprocessor"></span><span class="preprocessor">#define APR_TEST_INCLUDES</span>
+00019 <span class="preprocessor"></span>
+00020 <span class="preprocessor">#include "abts.h"</span>
+00021 <span class="preprocessor">#include "testutil.h"</span>
+00022 
+00023 <span class="keyword">const</span> <span class="keyword">struct </span>testlist {
+00024     abts_suite *(*func)(abts_suite *suite);
+00025 } alltests[] = {
+00026     {teststrmatch},
+00027     {testuri},
+00028     {testuuid},
+00029     {testbuckets},
+00030     {testpass},
+00031     {testmd4},
+00032     {testmd5},
+00033     {testldap}
+00034 };
+00035 
+00036 <span class="preprocessor">#endif </span><span class="comment">/* APR_TEST_INCLUDES */</span>
+</div></pre><hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:19:18 2005 for Apache Portable Runtime Utility Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-util/acconfig_8h-source.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-util/acconfig_8h-source.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-util/acconfig_8h-source.html (original)
+++ apr/site/trunk/docs/docs/apr-util/acconfig_8h-source.html Mon Feb  7 15:10:17 2005
@@ -3,7 +3,7 @@
 <title>Apache Portable Runtime Utility Library: xml/expat/acconfig.h Source File</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="namespaces.html">Namespace List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>xml/expat/acconfig.h</h1><pre class="fragment"><div>00001 <span class="comment">/* This file is used by autoheader to add items to expat_config.h.in */</span>
 00002 
@@ -28,8 +28,8 @@
 00021 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
 00022 <span class="preprocessor"></span>
 00023 <span class="preprocessor">#endif</span>
-</div></pre><hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:35:50 2004 for Apache Portable Runtime Utility Library by
+</div></pre><hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:19:18 2005 for Apache Portable Runtime Utility Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>

Modified: apr/site/trunk/docs/docs/apr-util/annotated.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/docs/apr-util/annotated.html?view=diff&r1=151767&r2=151768
==============================================================================
--- apr/site/trunk/docs/docs/apr-util/annotated.html (original)
+++ apr/site/trunk/docs/docs/apr-util/annotated.html Mon Feb  7 15:10:17 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>Apache Portable Runtime Utility Library: Data Structures</title>
+<title>Apache Portable Runtime Utility Library: Annotated Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.3.8 -->
+<!-- Generated by Doxygen 1.3.7 -->
 <div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="namespaces.html">Namespace List</a> | <a class="qindexHL" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>Apache Portable Runtime Utility Library Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="structapr__anylock__t.html">apr_anylock_t</a></td><td class="indexvalue"></td></tr>
@@ -33,8 +33,8 @@
   <tr><td class="indexkey"><a class="el" href="structapr__xml__doc.html">apr_xml_doc</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structapr__xml__elem.html">apr_xml_elem</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Sep 1 21:35:50 2004 for Apache Portable Runtime Utility Library by
+<hr size="1"><address style="align: right;"><small>Generated on Mon Feb 7 13:19:18 2005 for Apache Portable Runtime Utility Library by
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.8 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> 1.3.7 </small></address>
 </body>
 </html>