* miss spell

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1854 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index dbc26a8..ecaab92 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -329,7 +329,7 @@ tag_handler chtml10_handler[] = {
  * @return The character string after the converting is returned.
  */
 char *
-chxj_exchange_chtml10(
+chxj_convert_chtml10(
   request_rec        *r,
   device_table       *spec,
   const char         *src,
@@ -346,7 +346,7 @@ chxj_exchange_chtml10(
 
   dst = NULL;
 
-  DBG(r, "start chxj_exchange_chtml10() cookie_id=[%s]", (cookie) ? cookie->cookie_id : "");
+  DBG(r, "start chxj_convert_chtml10() cookie_id=[%s]", (cookie) ? cookie->cookie_id : "");
 
   /*--------------------------------------------------------------------------*/
   /* If qrcode xml                                                            */
@@ -392,7 +392,7 @@ chxj_exchange_chtml10(
   /*--------------------------------------------------------------------------*/
   /* It converts it from CHTML to CHTML.                                      */
   /*--------------------------------------------------------------------------*/
-  chxj_node_exchange(spec,r,(void *)&chtml10, &doc, qs_get_root(&doc), 0);
+  chxj_node_convert(spec,r,(void *)&chtml10, &doc, qs_get_root(&doc), 0);
   dst = chtml10.out;
 
 
@@ -410,7 +410,7 @@ chxj_exchange_chtml10(
   chxj_dump_out("[dst] CHTML -> CHTML1.0", dst, *dstlen);
 #endif
 
-  DBG(r, "end   chxj_exchange_chtml10() cookie_id=[%s]", (cookie) ? cookie->cookie_id : "");
+  DBG(r, "end   chxj_convert_chtml10() cookie_id=[%s]", (cookie) ? cookie->cookie_id : "");
 
   return dst;
 }

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index c5d8ea2..587d68a 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -331,7 +331,7 @@ tag_handler chtml20_handler[] = {
  * @return The character string after the converting is returned.
  */
 char *
-chxj_exchange_chtml20(
+chxj_convert_chtml20(
   request_rec         *r,
   device_table        *spec,
   const char          *src,
@@ -392,7 +392,7 @@ chxj_exchange_chtml20(
   /*--------------------------------------------------------------------------*/
   /* It converts it from CHTML to CHTML.                                      */
   /*--------------------------------------------------------------------------*/
-  chxj_node_exchange(spec,r,(void*)&chtml20, &doc, qs_get_root(&doc), 0);
+  chxj_node_convert(spec,r,(void*)&chtml20, &doc, qs_get_root(&doc), 0);
   dst = chtml20.out;
 
   qs_all_free(&doc,QX_LOGMARK);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 54051d4..d4cfb1d 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -329,7 +329,7 @@ tag_handler chtml30_handler[] = {
  * @return The character string after the converting is returned.
  */
 char*
-chxj_exchange_chtml30(
+chxj_convert_chtml30(
   request_rec         *r,
   device_table        *spec,
   const char          *src,
@@ -390,7 +390,7 @@ chxj_exchange_chtml30(
   /*--------------------------------------------------------------------------*/
   /* It converts it from CHTML to CHTML.                                      */
   /*--------------------------------------------------------------------------*/
-  chxj_node_exchange(spec,r,(void*)&chtml30, &doc, qs_get_root(&doc), 0);
+  chxj_node_convert(spec,r,(void*)&chtml30, &doc, qs_get_root(&doc), 0);
   dst = chtml30.out;
 
   qs_all_free(&doc,QX_LOGMARK);

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index aaee00f..469411c 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -329,7 +329,7 @@ tag_handler hdml_handler[] = {
  * @return         The character string after the converting is returned.
  */
 char *
-chxj_exchange_hdml(
+chxj_convert_hdml(
   request_rec         *r, 
   device_table        *spec, 
   const char          *src, 
@@ -419,7 +419,7 @@ chxj_exchange_hdml(
     /*------------------------------------------------------------------------*/
     s_hdml_count_radio_tag(&hdml, qs_get_root(&doc));
 
-    chxj_node_exchange(spec,r,(void*)&hdml, &doc, qs_get_root(&doc), 0);
+    chxj_node_convert(spec,r,(void*)&hdml, &doc, qs_get_root(&doc), 0);
     dst = hdml.out;
 
     DBG(r,"tmp=[%s]", dst);

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index cd33e3e..eb2d043 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -325,7 +325,7 @@ tag_handler jhtml_handler[] = {
  * @return The character string after the converting is returned.
  */
 char *
-chxj_exchange_jhtml(
+chxj_convert_jhtml(
   request_rec         *r,
   device_table        *spec,
   const char          *src,
@@ -388,7 +388,7 @@ chxj_exchange_jhtml(
   /*--------------------------------------------------------------------------*/
   /* It converts it from CHTML to JHTML.                                      */
   /*--------------------------------------------------------------------------*/
-  chxj_node_exchange(spec,r,(void*)&jhtml, &doc, qs_get_root(&doc), 0);
+  chxj_node_convert(spec,r,(void*)&jhtml, &doc, qs_get_root(&doc), 0);
   dst = jhtml.out;
 
   qs_all_free(&doc,QX_LOGMARK);

diff --git a/src/chxj_node_exchange.c b/src/chxj_node_convert.c
old mode 100644 (file)
new mode 100755 (executable)
similarity index 90%
rename from src/chxj_node_exchange.c
rename to src/chxj_node_convert.c
index 6a00f3a..b64a32d
--- a/src/chxj_node_exchange.c
+++ b/src/chxj_node_convert.c
@@ -81,7 +81,7 @@ tag_handlers chxj_tag_handlers[] = {
  * @return The character string after it converts it is returned. 
  */
 char *
-chxj_node_exchange(
+chxj_node_convert(
   device_table *spec,
   request_rec  *r,
   void         *pdoc, 
@@ -117,7 +117,7 @@ chxj_node_exchange(
         if (handlers[tagHTML].start_tag_handler) 
           handlers[tagHTML].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagHTML].end_tag_handler)
           handlers[tagHTML].end_tag_handler(pdoc, child);
@@ -130,7 +130,7 @@ chxj_node_exchange(
         if (handlers[tagHEAD].start_tag_handler) 
           handlers[tagHEAD].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagHEAD].end_tag_handler)
           handlers[tagHEAD].end_tag_handler(pdoc, child);
@@ -154,7 +154,7 @@ chxj_node_exchange(
         if (handlers[tagH1].start_tag_handler) 
           handlers[tagH1].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagH1].end_tag_handler)
           handlers[tagH1].end_tag_handler(pdoc, child);
@@ -167,7 +167,7 @@ chxj_node_exchange(
         if (handlers[tagH2].start_tag_handler) 
           handlers[tagH2].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagH2].end_tag_handler)
           handlers[tagH2].end_tag_handler(pdoc, child);
@@ -180,7 +180,7 @@ chxj_node_exchange(
         if (handlers[tagH3].start_tag_handler) 
           handlers[tagH3].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagH3].end_tag_handler)
           handlers[tagH3].end_tag_handler(pdoc, child);
@@ -193,7 +193,7 @@ chxj_node_exchange(
         if (handlers[tagH4].start_tag_handler) 
           handlers[tagH4].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagH4].end_tag_handler)
           handlers[tagH4].end_tag_handler(pdoc, child);
@@ -206,7 +206,7 @@ chxj_node_exchange(
         if (handlers[tagH5].start_tag_handler) 
           handlers[tagH5].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagH5].end_tag_handler)
           handlers[tagH5].end_tag_handler(pdoc, child);
@@ -219,7 +219,7 @@ chxj_node_exchange(
         if (handlers[tagH6].start_tag_handler) 
           handlers[tagH6].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagH6].end_tag_handler)
           handlers[tagH6].end_tag_handler(pdoc, child);
@@ -236,7 +236,7 @@ chxj_node_exchange(
         if (handlers[tagP].start_tag_handler) 
           handlers[tagP].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagP].end_tag_handler)
           handlers[tagP].end_tag_handler(pdoc, child);
@@ -249,7 +249,7 @@ chxj_node_exchange(
         if (handlers[tagPRE].start_tag_handler) 
           handlers[tagPRE].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagPRE].end_tag_handler)
           handlers[tagPRE].end_tag_handler(pdoc, child);
@@ -265,7 +265,7 @@ chxj_node_exchange(
         if (handlers[tagNOBR].start_tag_handler) 
           handlers[tagNOBR].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagNOBR].end_tag_handler)
           handlers[tagNOBR].end_tag_handler(pdoc, child);
@@ -281,7 +281,7 @@ chxj_node_exchange(
         if (handlers[tagUL].start_tag_handler) 
           handlers[tagUL].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagUL].end_tag_handler)
           handlers[tagUL].end_tag_handler(pdoc, child);
@@ -297,7 +297,7 @@ chxj_node_exchange(
         if (handlers[tagLI].start_tag_handler) 
           handlers[tagLI].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagLI].end_tag_handler)
           handlers[tagLI].end_tag_handler(pdoc, child);
@@ -310,7 +310,7 @@ chxj_node_exchange(
         if (handlers[tagLEGEND].start_tag_handler) 
           handlers[tagLEGEND].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagLEGEND].end_tag_handler)
           handlers[tagLEGEND].end_tag_handler(pdoc, child);
@@ -323,7 +323,7 @@ chxj_node_exchange(
         if (handlers[tagLABEL].start_tag_handler) 
           handlers[tagLABEL].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagLABEL].end_tag_handler)
           handlers[tagLABEL].end_tag_handler(pdoc, child);
@@ -340,7 +340,7 @@ chxj_node_exchange(
         if (handlers[tagOL].start_tag_handler) 
           handlers[tagOL].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagOL].end_tag_handler)
           handlers[tagOL].end_tag_handler(pdoc, child);
@@ -353,7 +353,7 @@ chxj_node_exchange(
         if (handlers[tagOPTION].start_tag_handler) 
           handlers[tagOPTION].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagOPTION].end_tag_handler)
           handlers[tagOPTION].end_tag_handler(pdoc, child);
@@ -370,7 +370,7 @@ chxj_node_exchange(
         if (handlers[tagMETA].start_tag_handler) 
           handlers[tagMETA].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagMETA].end_tag_handler)
           handlers[tagMETA].end_tag_handler(pdoc, child);
@@ -386,7 +386,7 @@ chxj_node_exchange(
         if (handlers[tagB].start_tag_handler) 
           handlers[tagB].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagB].end_tag_handler)
           handlers[tagB].end_tag_handler(pdoc, child);
@@ -399,7 +399,7 @@ chxj_node_exchange(
         if (handlers[tagBASE].start_tag_handler) 
           handlers[tagBASE].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagBASE].end_tag_handler)
           handlers[tagBASE].end_tag_handler(pdoc, child);
@@ -412,7 +412,7 @@ chxj_node_exchange(
         if (handlers[tagBODY].start_tag_handler) 
           handlers[tagBODY].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagBODY].end_tag_handler)
           handlers[tagBODY].end_tag_handler(pdoc, child);
@@ -425,7 +425,7 @@ chxj_node_exchange(
         if (handlers[tagBR].start_tag_handler) 
           handlers[tagBR].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagBR].end_tag_handler)
           handlers[tagBR].end_tag_handler(pdoc, child);
@@ -441,7 +441,7 @@ chxj_node_exchange(
         if (handlers[tagA].start_tag_handler) 
           handlers[tagA].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagA].end_tag_handler)
           handlers[tagA].end_tag_handler(pdoc, child);
@@ -457,7 +457,7 @@ chxj_node_exchange(
         if (handlers[tagFONT].start_tag_handler) 
           handlers[tagFONT].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagFONT].end_tag_handler)
           handlers[tagFONT].end_tag_handler(pdoc, child);
@@ -470,7 +470,7 @@ chxj_node_exchange(
         if (handlers[tagFORM].start_tag_handler) 
           handlers[tagFORM].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagFORM].end_tag_handler)
           handlers[tagFORM].end_tag_handler(pdoc, child);
@@ -483,7 +483,7 @@ chxj_node_exchange(
         if (handlers[tagFIELDSET].start_tag_handler) 
           handlers[tagFIELDSET].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagFIELDSET].end_tag_handler)
           handlers[tagFIELDSET].end_tag_handler(pdoc, child);
@@ -499,7 +499,7 @@ chxj_node_exchange(
         if (handlers[tagINPUT].start_tag_handler) 
           handlers[tagINPUT].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagINPUT].end_tag_handler)
           handlers[tagINPUT].end_tag_handler(pdoc, child);
@@ -512,7 +512,7 @@ chxj_node_exchange(
         if (handlers[tagIMG].start_tag_handler) 
           handlers[tagIMG].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagIMG].end_tag_handler)
           handlers[tagIMG].end_tag_handler(pdoc, child);
@@ -528,7 +528,7 @@ chxj_node_exchange(
         if (handlers[tagSELECT].start_tag_handler) 
           handlers[tagSELECT].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagSELECT].end_tag_handler)
           handlers[tagSELECT].end_tag_handler(pdoc, child);
@@ -540,10 +540,6 @@ chxj_node_exchange(
       if (strcasecmp(name, "style") == 0) {
         if (handlers[tagSTYLE].start_tag_handler) 
           handlers[tagSTYLE].start_tag_handler(pdoc, child);
-#if 0
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
-#endif
-
         if (handlers[tagSTYLE].end_tag_handler)
           handlers[tagSTYLE].end_tag_handler(pdoc, child);
       }
@@ -555,7 +551,7 @@ chxj_node_exchange(
         if (handlers[tagSPAN].start_tag_handler) 
           handlers[tagSPAN].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagSPAN].end_tag_handler)
           handlers[tagSPAN].end_tag_handler(pdoc, child);
@@ -568,7 +564,7 @@ chxj_node_exchange(
         if (handlers[tagSMALL].start_tag_handler) 
           handlers[tagSMALL].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagSMALL].end_tag_handler)
           handlers[tagSMALL].end_tag_handler(pdoc, child);
@@ -584,7 +580,7 @@ chxj_node_exchange(
         if (handlers[tagDIV].start_tag_handler) 
           handlers[tagDIV].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagDIV].end_tag_handler)
           handlers[tagDIV].end_tag_handler(pdoc, child);
@@ -600,7 +596,7 @@ chxj_node_exchange(
         if (handlers[tagCENTER].start_tag_handler) 
           handlers[tagCENTER].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagCENTER].end_tag_handler)
           handlers[tagCENTER].end_tag_handler(pdoc, child);
@@ -616,7 +612,7 @@ chxj_node_exchange(
           parse_attr = qs_get_parse_attr(doc, child, r);
 
           if (parse_attr && strcasecmp(parse_attr, "true") == 0) {
-            chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+            chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
           }
           else {
             if (handlers[tagCHXJIF].start_tag_handler)
@@ -635,7 +631,7 @@ chxj_node_exchange(
         if (handlers[tagTEXTAREA].start_tag_handler) 
           handlers[tagTEXTAREA].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTEXTAREA].end_tag_handler)
           handlers[tagTEXTAREA].end_tag_handler(pdoc, child);
@@ -648,7 +644,7 @@ chxj_node_exchange(
         if (handlers[tagTITLE].start_tag_handler) 
           handlers[tagTITLE].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTITLE].end_tag_handler)
           handlers[tagTITLE].end_tag_handler(pdoc, child);
@@ -661,7 +657,7 @@ chxj_node_exchange(
         if (handlers[tagTABLE].start_tag_handler) 
           handlers[tagTABLE].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTABLE].end_tag_handler)
           handlers[tagTABLE].end_tag_handler(pdoc, child);
@@ -674,7 +670,7 @@ chxj_node_exchange(
         if (handlers[tagTBODY].start_tag_handler) 
           handlers[tagTBODY].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTBODY].end_tag_handler)
           handlers[tagTBODY].end_tag_handler(pdoc, child);
@@ -687,7 +683,7 @@ chxj_node_exchange(
         if (handlers[tagTH].start_tag_handler) 
           handlers[tagTH].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTH].end_tag_handler)
           handlers[tagTH].end_tag_handler(pdoc, child);
@@ -700,7 +696,7 @@ chxj_node_exchange(
         if (handlers[tagTR].start_tag_handler) 
           handlers[tagTR].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTR].end_tag_handler)
           handlers[tagTR].end_tag_handler(pdoc, child);
@@ -713,7 +709,7 @@ chxj_node_exchange(
         if (handlers[tagTD].start_tag_handler) 
           handlers[tagTD].start_tag_handler(pdoc, child);
 
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 
         if (handlers[tagTD].end_tag_handler)
           handlers[tagTD].end_tag_handler(pdoc, child);
@@ -729,7 +725,7 @@ chxj_node_exchange(
       break;
 
     default:
-      chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+      chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
     }
   }
 

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index ecc9eaa..ad57c61 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -336,7 +336,7 @@ tag_handler xhtml_handler[] = {
  * @return The character string after the converting is returned.
  */
 char *
-chxj_exchange_xhtml_mobile_1_0(
+chxj_convert_xhtml_mobile_1_0(
   request_rec     *r,
   device_table    *spec,
   const char      *src,
@@ -351,7 +351,7 @@ chxj_exchange_xhtml_mobile_1_0(
   xhtml_t   xhtml;
   Doc       doc;
 
-  DBG(r,"start chxj_exchange_xhtml_mobile_1_0()");
+  DBG(r,"start chxj_convert_xhtml_mobile_1_0()");
 
   /*--------------------------------------------------------------------------*/
   /* If qrcode xml                                                            */
@@ -398,7 +398,7 @@ chxj_exchange_xhtml_mobile_1_0(
   /*--------------------------------------------------------------------------*/
   /* It converts it from CHTML to XHTML.                                      */
   /*--------------------------------------------------------------------------*/
-  chxj_node_exchange(spec,r,(void*)&xhtml, &doc, qs_get_root(&doc), 0);
+  chxj_node_convert(spec,r,(void*)&xhtml, &doc, qs_get_root(&doc), 0);
   dst = xhtml.out;  
 
   qs_all_free(&doc,QX_LOGMARK);
@@ -415,7 +415,7 @@ chxj_exchange_xhtml_mobile_1_0(
   chxj_dump_out("[dst] CHTML->XHTML", dst, *dstlen);
 #endif
 
-  DBG(r,"end chxj_exchange_xhtml_mobile_1_0()");
+  DBG(r,"end chxj_convert_xhtml_mobile_1_0()");
 
   return dst;
 }

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 8d2a594..cf5ab1f 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -73,52 +73,52 @@ converter_t convert_routine[] = {
   },
   {
     /* CHXJ_SPEC_Chtml_1_0        */
-    .converter = chxj_exchange_chtml10,
+    .converter = chxj_convert_chtml10,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_2_0        */
-    .converter = chxj_exchange_chtml20,
+    .converter = chxj_convert_chtml20,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_3_0        */
-    .converter = chxj_exchange_chtml30,
+    .converter = chxj_convert_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_4_0        */
-    .converter = chxj_exchange_chtml30,
+    .converter = chxj_convert_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_5_0        */
-    .converter = chxj_exchange_chtml30,
+    .converter = chxj_convert_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_6_0        */
-    .converter = chxj_exchange_chtml30,
+    .converter = chxj_convert_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_7_0        */
-    .converter = chxj_exchange_chtml30,
+    .converter = chxj_convert_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_XHtml_Mobile_1_0 */
-    .converter = chxj_exchange_xhtml_mobile_1_0,
+    .converter = chxj_convert_xhtml_mobile_1_0,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Hdml             */
-    .converter = chxj_exchange_hdml,
+    .converter = chxj_convert_hdml,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Jhtml            */
-    .converter = chxj_exchange_jhtml,
+    .converter = chxj_convert_jhtml,
     .encoder  = chxj_encoding,
   },
   {
@@ -198,7 +198,7 @@ chxj_headers_fixup(request_rec *r)
  * @param len [i/o] It is length of former HTML character string. 
  */
 static char *
-chxj_exchange(request_rec *r, const char** src, apr_size_t* len, device_table *spec, const char *ua)
+chxj_convert_html(request_rec *r, const char** src, apr_size_t* len, device_table *spec, const char *ua)
 {
   char                *user_agent;
   char                *dst;
@@ -226,7 +226,7 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len, device_table *s
     user_agent = (char*)apr_table_get(r->headers_in, HTTP_USER_AGENT);
 
   DBG(r,"User-Agent:[%s]", user_agent);
-  DBG(r, "start chxj_exchange()");
+  DBG(r, "start chxj_convert_html()");
   DBG(r,"content type is %s", r->content_type);
 
 
@@ -321,7 +321,7 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len, device_table *s
   }
   dst[*len] = 0;
 
-  DBG(r, "end chxj_exchange()");
+  DBG(r, "end chxj_convert_html()");
 
   return dst;
 }
@@ -761,7 +761,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
             DBG(r, "input data=[%s] len=[%d]", tmp, ctx->len);
 #endif
 
-            ctx->buffer = chxj_exchange(r, 
+            ctx->buffer = chxj_convert_html(r, 
                                         (const char**)&tmp, 
                                         (apr_size_t*)&ctx->len,
                                         spec,
@@ -774,7 +774,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
           else {
             ctx->buffer = apr_psprintf(r->pool, "\n");
             ctx->len += 1;
-            ctx->buffer = chxj_exchange(r, 
+            ctx->buffer = chxj_convert_html(r, 
                                         (const char**)&ctx->buffer, 
                                         (apr_size_t*)&ctx->len,
                                         spec,
@@ -1123,7 +1123,7 @@ chxj_input_filter(ap_filter_t         *f,
     spec);
 
   if (len > 0) {
-    DBG(r, "(in:exchange)POSTDATA:[%s]", data_brigade);
+    DBG(r, "(in:convert)POSTDATA:[%s]", data_brigade);
     obb = apr_brigade_create(r->pool, c->bucket_alloc);
     tmp_heap = apr_bucket_heap_create(data_brigade, 
                                       len,