* rename chxj_node_exchange --> chxj_node_convert

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

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index bef2bb6..3e0b48f 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -397,13 +397,13 @@ extern tag_handler  xhtml_handler[];
 extern tag_handler  hdml_handler[];
 extern tag_handler  jhtml_handler[];
 
-extern char* chxj_node_exchange( 
-  device_table* spec,
-  request_rec*  r,
-  void*         pdoc,
-  Doc*          doc,
-  Node*         node,
-  int           indent
+extern char* chxj_node_convert( 
+  device_table *spec,
+  request_rec  *r,
+  void         *pdoc,
+  Doc          *doc,
+  Node         *node,
+  int          indent
 );
 
 #define IMAGE_CACHE_LIMIT_FMT_LEN  (20)

diff --git a/src/Makefile.am b/src/Makefile.am
index 29d6a3a..82810c3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_calc_ecc.c \
     chxj_apply_convrule.c \
     chxj_encoding.c \
-    chxj_node_exchange.c \
+    chxj_node_convert.c \
     chxj_url_encode.c \
     chxj_preg_replace.c \
     chxj_cookie.c \

diff --git a/src/Makefile.in b/src/Makefile.in
index 055be62..8a3751a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -70,7 +70,7 @@ am_libmod_chxj_la_OBJECTS = libmod_chxj_la-mod_chxj.lo \
        libmod_chxj_la-chxj_qr_code.lo libmod_chxj_la-chxj_calc_ecc.lo \
        libmod_chxj_la-chxj_apply_convrule.lo \
        libmod_chxj_la-chxj_encoding.lo \
-       libmod_chxj_la-chxj_node_exchange.lo \
+       libmod_chxj_la-chxj_node_convert.lo \
        libmod_chxj_la-chxj_url_encode.lo \
        libmod_chxj_la-chxj_preg_replace.lo \
        libmod_chxj_la-chxj_cookie.lo libmod_chxj_la-chxj_mysql.lo \
@@ -247,7 +247,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_calc_ecc.c \
     chxj_apply_convrule.c \
     chxj_encoding.c \
-    chxj_node_exchange.c \
+    chxj_node_convert.c \
     chxj_url_encode.c \
     chxj_preg_replace.c \
     chxj_cookie.c \
@@ -348,7 +348,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_load_emoji_data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_memcache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_mysql.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_node_convert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_preg_replace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_qr_code.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_specified_device.Plo@am__quote@
@@ -568,12 +568,12 @@ libmod_chxj_la-chxj_encoding.lo: chxj_encoding.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_encoding.lo `test -f 'chxj_encoding.c' || echo '$(srcdir)/'`chxj_encoding.c
 
-libmod_chxj_la-chxj_node_exchange.lo: chxj_node_exchange.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_node_exchange.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Tpo -c -o libmod_chxj_la-chxj_node_exchange.lo `test -f 'chxj_node_exchange.c' || echo '$(srcdir)/'`chxj_node_exchange.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Tpo $(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='chxj_node_exchange.c' object='libmod_chxj_la-chxj_node_exchange.lo' libtool=yes @AMDEPBACKSLASH@
+libmod_chxj_la-chxj_node_convert.lo: chxj_node_convert.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_node_convert.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_node_convert.Tpo -c -o libmod_chxj_la-chxj_node_convert.lo `test -f 'chxj_node_convert.c' || echo '$(srcdir)/'`chxj_node_convert.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libmod_chxj_la-chxj_node_convert.Tpo $(DEPDIR)/libmod_chxj_la-chxj_node_convert.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='chxj_node_convert.c' object='libmod_chxj_la-chxj_node_convert.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_node_exchange.lo `test -f 'chxj_node_exchange.c' || echo '$(srcdir)/'`chxj_node_exchange.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_node_convert.lo `test -f 'chxj_node_convert.c' || echo '$(srcdir)/'`chxj_node_convert.c
 
 libmod_chxj_la-chxj_url_encode.lo: chxj_url_encode.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_url_encode.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_url_encode.Tpo -c -o libmod_chxj_la-chxj_url_encode.lo `test -f 'chxj_url_encode.c' || echo '$(srcdir)/'`chxj_url_encode.c

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index 2298b02..dd35d1d 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -450,7 +450,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);
   chtml10.out = chxj_buffered_write_flush(chtml10.out, &doc.buf);
   dst = apr_pstrdup(r->pool, chtml10.out);
   chxj_buffered_write_terminate(&doc.buf);

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index 2e6a98c..67b991d 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -454,7 +454,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);
   chtml20.out = chxj_buffered_write_flush(chtml20.out, &doc.buf);
   dst = apr_pstrdup(r->pool, chtml20.out);
   chxj_buffered_write_terminate(&doc.buf);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index eeeb3fd..86cf309 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -455,7 +455,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);
   chtml30.out = chxj_buffered_write_flush(chtml30.out, &doc.buf);
   dst = apr_pstrdup(r->pool, chtml30.out);
   chxj_buffered_write_terminate(&doc.buf);

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 1da8836..af411f3 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -477,7 +477,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 db5e336..9ed8469 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -461,7 +461,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);
   jhtml.out = chxj_buffered_write_flush(jhtml.out, &doc.buf);
   dst = apr_pstrdup(r->pool, jhtml.out);
   chxj_buffered_write_terminate(&doc.buf);

diff --git a/src/chxj_node_exchange.c b/src/chxj_node_convert.c
similarity index 88%
rename from src/chxj_node_exchange.c
rename to src/chxj_node_convert.c
index c97e031..b318a5c 100644 (file)
--- a/src/chxj_node_exchange.c
+++ b/src/chxj_node_convert.c
@@ -85,7 +85,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,13 +219,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -239,7 +239,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);
@@ -251,7 +251,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);
@@ -267,7 +267,7 @@ chxj_node_exchange(
           handlers[tagPLAINTEXT].end_tag_handler(pdoc, child);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -280,13 +280,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -299,13 +299,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -318,7 +318,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);
@@ -331,7 +331,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);
@@ -344,13 +344,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       
       break;
@@ -364,7 +364,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);
@@ -377,7 +377,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);
@@ -390,7 +390,7 @@ chxj_node_exchange(
         /* ignore object block */
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
 
       break;
@@ -404,7 +404,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);
@@ -416,7 +416,7 @@ chxj_node_exchange(
         if (handlers[tagMENU].start_tag_handler) 
           handlers[tagMENU].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[tagMENU].end_tag_handler)
           handlers[tagMENU].end_tag_handler(pdoc, child);
@@ -428,13 +428,13 @@ chxj_node_exchange(
         if (handlers[tagMARQUEE].start_tag_handler) 
           handlers[tagMARQUEE].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[tagMARQUEE].end_tag_handler)
           handlers[tagMARQUEE].end_tag_handler(pdoc, child);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -447,7 +447,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);
@@ -460,7 +460,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);
@@ -473,7 +473,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);
@@ -485,7 +485,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);
@@ -497,7 +497,7 @@ chxj_node_exchange(
         if (handlers[tagBLOCKQUOTE].start_tag_handler) 
           handlers[tagBLOCKQUOTE].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[tagBLOCKQUOTE].end_tag_handler)
           handlers[tagBLOCKQUOTE].end_tag_handler(pdoc, child);
@@ -509,13 +509,13 @@ chxj_node_exchange(
         if (handlers[tagBLINK].start_tag_handler) 
           handlers[tagBLINK].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[tagBLINK].end_tag_handler)
           handlers[tagBLINK].end_tag_handler(pdoc, child);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -528,13 +528,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -547,7 +547,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);
@@ -560,7 +560,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);
@@ -573,13 +573,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -592,7 +592,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);
@@ -605,13 +605,13 @@ 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);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -624,7 +624,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);
@@ -637,7 +637,7 @@ chxj_node_exchange(
         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);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
 #endif
 
         if (handlers[tagSTYLE].end_tag_handler)
@@ -651,7 +651,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);
@@ -664,7 +664,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);
@@ -677,7 +677,7 @@ chxj_node_exchange(
         /* ignore script block */
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
   
@@ -690,7 +690,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);
@@ -702,7 +702,7 @@ chxj_node_exchange(
         if (handlers[tagDIR].start_tag_handler) 
           handlers[tagDIR].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[tagDIR].end_tag_handler)
           handlers[tagDIR].end_tag_handler(pdoc, child);
@@ -714,7 +714,7 @@ chxj_node_exchange(
         if (handlers[tagDL].start_tag_handler) 
           handlers[tagDL].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[tagDL].end_tag_handler)
           handlers[tagDL].end_tag_handler(pdoc, child);
@@ -726,7 +726,7 @@ chxj_node_exchange(
         if (handlers[tagDT].start_tag_handler) 
           handlers[tagDT].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[tagDT].end_tag_handler)
           handlers[tagDT].end_tag_handler(pdoc, child);
@@ -738,13 +738,13 @@ chxj_node_exchange(
         if (handlers[tagDD].start_tag_handler) 
           handlers[tagDD].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[tagDD].end_tag_handler)
           handlers[tagDD].end_tag_handler(pdoc, child);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -757,7 +757,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);
@@ -773,7 +773,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)
@@ -782,7 +782,7 @@ chxj_node_exchange(
         }
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       break;
 
@@ -795,7 +795,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);
@@ -808,7 +808,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);
@@ -821,7 +821,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);
@@ -834,7 +834,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);
@@ -847,7 +847,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);
@@ -860,7 +860,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);
@@ -873,7 +873,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);
@@ -887,12 +887,12 @@ chxj_node_exchange(
           handlers[tagTEXT].start_tag_handler(pdoc, child);
       }
       else {
-        chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);
+        chxj_node_convert(spec, r, pdoc, doc, child, indent+1);
       }
       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 d23bcde..09f2620 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -451,7 +451,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);
   xhtml.out = chxj_buffered_write_flush(xhtml.out, &doc.buf);
   dst = apr_pstrdup(r->pool, xhtml.out);
   chxj_buffered_write_terminate(&doc.buf);