* rename

    - exchange ==> convert (oops..)

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

diff --git a/include/chxj_chtml10.h b/include/chxj_chtml10.h
index 9b3985d..fa96727 100644 (file)
--- a/include/chxj_chtml10.h
+++ b/include/chxj_chtml10.h
@@ -28,28 +28,28 @@
 typedef struct ctml10_t chtml10_t;
 
 struct ctml10_t {
-    Doc*                doc;
-    char*               out;
+    Doc                 *doc;
+    char                *out;
     int                 out_len;
     int                 pre_flag;
     int                 textarea_flag;
 
-    device_table*       spec;
-    mod_chxj_config*    conf;
-    chxjconvrule_entry* entryp;
-    cookie_t*           cookie;
+    device_table        *spec;
+    mod_chxj_config     *conf;
+    chxjconvrule_entry  *entryp;
+    cookie_t            *cookie;
 };
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_chtml10(
-  request_rec*          r,
-  device_table*         spec, 
-  const char*           src, 
+extern char *chxj_convert_chtml10(
+  request_rec           *r,
+  device_table          *spec, 
+  const char            *src, 
   apr_size_t            srclen, 
-  apr_size_t*           dstlen, 
-  chxjconvrule_entry*   entryp, 
-  cookie_t*             cookie);
+  apr_size_t            *dstlen, 
+  chxjconvrule_entry    *entryp, 
+  cookie_t              *cookie);
 
 #endif

diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 45e1ff9..1c8144b 100644 (file)
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -28,28 +28,28 @@
 typedef struct ctml20_t chtml20_t;
 
 struct ctml20_t {
-    Doc*                doc;
-    char*               out;
+    Doc                 *doc;
+    char                *out;
     int                 out_len;
     int                 pre_flag;
     int                 textarea_flag;
 
-    device_table*       spec;
-    mod_chxj_config*    conf;
-    chxjconvrule_entry* entryp;
-    cookie_t*           cookie;
+    device_table        *spec;
+    mod_chxj_config     *conf;
+    chxjconvrule_entry  *entryp;
+    cookie_t            *cookie;
 };
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_chtml20(
-  request_rec*          r,
-  device_table*         spec,
-  const char*           src,
+extern char *chxj_convert_chtml20(
+  request_rec           *r,
+  device_table          *spec,
+  const char            *src,
   apr_size_t            srclen,
-  apr_size_t*           dstlen,
-  chxjconvrule_entry*   entryp,
-  cookie_t*             cookie);
+  apr_size_t            *dstlen,
+  chxjconvrule_entry    *entryp,
+  cookie_t              *cookie);
 
 #endif

diff --git a/include/chxj_chtml30.h b/include/chxj_chtml30.h
index 685257d..4db60e7 100644 (file)
--- a/include/chxj_chtml30.h
+++ b/include/chxj_chtml30.h
@@ -28,28 +28,28 @@
 typedef struct chtml30_t chtml30_t;
 
 struct chtml30_t {
-    Doc*                doc;
-    char*               out;
+    Doc                 *doc;
+    char                *out;
     int                 out_len;
     int                 pre_flag;
     int                 textarea_flag;
 
-    device_table*       spec;
-    mod_chxj_config*    conf;
-    chxjconvrule_entry* entryp;
-    cookie_t*           cookie;
+    device_table        *spec;
+    mod_chxj_config     *conf;
+    chxjconvrule_entry  *entryp;
+    cookie_t            *cookie;
 };
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_chtml30(
-  request_rec*          r,
-  device_table*         spec,
-  const char*           src,
+extern char *chxj_convert_chtml30(
+  request_rec           *r,
+  device_table          *spec,
+  const char            *src,
   apr_size_t            srclen,
-  apr_size_t*           dstlen,
-  chxjconvrule_entry*   entryp,
-  cookie_t*             cookie);
+  apr_size_t            *dstlen,
+  chxjconvrule_entry    *entryp,
+  cookie_t              *cookie);
 
 #endif

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 7680d47..3d9f650 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -104,7 +104,7 @@ struct hdml_t {
 /*============================================================================*/
 /* Prototype declaration.                                                     */
 /*============================================================================*/
-extern char *chxj_exchange_hdml(
+extern char *chxj_convert_hdml(
   request_rec         *r, 
   device_table        *spec,
   const char          *src,

diff --git a/include/chxj_img_conv_format.h b/include/chxj_img_conv_format.h
index ad838fa..1b073ef 100644 (file)
--- a/include/chxj_img_conv_format.h
+++ b/include/chxj_img_conv_format.h
@@ -29,15 +29,15 @@
 
 
 extern int chxj_img_conv_format_handler(
-  request_rec*         r);
+  request_rec          *r);
 
-extern char* chxj_exchange_image(
-  request_rec*         r, 
-  const char**         src, 
-  apr_size_t*          len);
+extern char* chxj_convert_image(
+  request_rec          *r, 
+  const char           **src, 
+  apr_size_t           *len);
 
 extern int chxj_trans_name(
-  request_rec*         r);
+  request_rec          *r);
 
 
 #endif

diff --git a/include/chxj_jhtml.h b/include/chxj_jhtml.h
index 322c9c5..5818624 100644 (file)
--- a/include/chxj_jhtml.h
+++ b/include/chxj_jhtml.h
@@ -49,7 +49,7 @@ struct jhtml_t {
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char *chxj_exchange_jhtml(
+extern char *chxj_convert_jhtml(
   request_rec               *r,
   device_table              *spec,
   const char                *src,

diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 799dc9f..17c1bba 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -25,28 +25,28 @@
 typedef struct xhtml_t xhtml_t;
 
 struct xhtml_t {
-    Doc*                doc;
-    char*               out;
+    Doc                 *doc;
+    char                *out;
     int                 out_len;
     int                 pre_flag;
     int                 textarea_flag;
 
-    device_table*       spec;
-    mod_chxj_config*    conf;
-    chxjconvrule_entry* entryp;
-    cookie_t*           cookie;
+    device_table        *spec;
+    mod_chxj_config     *conf;
+    chxjconvrule_entry  *entryp;
+    cookie_t            *cookie;
 };
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_xhtml_mobile_1_0(
-  request_rec*          r,
-  device_table*         spec,
-  const char*           src,
+extern char *chxj_convert_xhtml_mobile_1_0(
+  request_rec           *r,
+  device_table          *spec,
+  const char            *src,
   apr_size_t            srclen,
-  apr_size_t*           dstlen,
-  chxjconvrule_entry*   entryp,
-  cookie_t*             cookie);
+  apr_size_t            *dstlen,
+  chxjconvrule_entry    *entryp,
+  cookie_t              *cookie);
 
 #endif

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index dd35d1d..e3a68c5 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -389,7 +389,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,
@@ -408,7 +408,7 @@ chxj_exchange_chtml10(
   dst = NULL;
 
   t = apr_time_now();
-  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                                                            */
@@ -470,7 +470,7 @@ chxj_exchange_chtml10(
   chxj_dump_out("[dst] CHTML -> CHTML1.0", dst, *dstlen);
 #endif
 
-  DBG(r, "end   chxj_exchange_chtml10() cookie_id=[%s] time=[%lld]", (cookie) ? cookie->cookie_id : "", apr_time_now() - t);
+  DBG(r, "end   chxj_convert_chtml10() cookie_id=[%s] time=[%lld]", (cookie) ? cookie->cookie_id : "", apr_time_now() - t);
 
   return dst;
 }

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index 67b991d..6c5d35b 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -397,7 +397,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,

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 86cf309..6394c0d 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -396,7 +396,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,
@@ -411,7 +411,7 @@ chxj_exchange_chtml30(
   chtml30_t chtml30;
   Doc       doc;
 
-  DBG(r, "start chxj_exchange_chtml30()");
+  DBG(r, "start chxj_convert_chtml30()");
 
   /*--------------------------------------------------------------------------*/
   /* If qrcode xml                                                            */
@@ -420,7 +420,7 @@ chxj_exchange_chtml30(
   dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen);
   if (dst) {
     DBG(r,"i found qrcode xml");
-    DBG(r, "end chxj_exchange_chtml30()");
+    DBG(r, "end chxj_convert_chtml30()");
     return dst;
   }
   DBG(r,"not found qrcode xml");
@@ -475,7 +475,7 @@ chxj_exchange_chtml30(
   chxj_dump_out("[src] CHTML -> CHTML3.0", dst, *dstlen);
 #endif
 
-  DBG(r, "end chxj_exchange_chtml30()");
+  DBG(r, "end chxj_convert_chtml30()");
   return dst;
 }
 

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index af411f3..8f66c8b 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -388,7 +388,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, 

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 4b1249b..2f5bebc 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -299,7 +299,7 @@ chxj_img_conv_format_handler(request_rec *r)
  * @param len [i/o] It is length of former image binary data.
  */
 char *
-chxj_exchange_image(request_rec *r, const char **src, apr_size_t *len)
+chxj_convert_image(request_rec *r, const char **src, apr_size_t *len)
 {
   mod_chxj_config       *conf;
   query_string_param_t  *qsp;
@@ -309,7 +309,7 @@ chxj_exchange_image(request_rec *r, const char **src, apr_size_t *len)
   char                  *conv_check;
   chxjconvrule_entry    *entryp;
 
-  DBG(r, "start chxj_exchange_image()");
+  DBG(r, "start chxj_convert_image()");
 
   conv_check = (char*)apr_table_get(r->headers_in, "CHXJ_IMG_CONV");
   if (conv_check) {
@@ -321,7 +321,7 @@ chxj_exchange_image(request_rec *r, const char **src, apr_size_t *len)
   qsp = s_get_query_string_param(r);
   conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
   if (conf == NULL) {
-    DBG(r, "end chxj_exchange_image()");
+    DBG(r, "end chxj_convert_image()");
     return NULL;
   }
 
@@ -356,7 +356,7 @@ chxj_exchange_image(request_rec *r, const char **src, apr_size_t *len)
   if (dst == NULL) 
     *len = 0;
 
-  DBG(r, "end chxj_exchange_image()");
+  DBG(r, "end chxj_convert_image()");
 
   return dst;
 }

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 9ed8469..25ea8a8 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -401,8 +401,8 @@ tag_handler jhtml_handler[] = {
  * @param src   [i]   The character string before the converting is appointed.
  * @return The character string after the converting is returned.
  */
-char*
-chxj_exchange_jhtml(
+char *
+chxj_convert_jhtml(
   request_rec         *r,
   device_table        *spec,
   const char          *src,

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 09f2620..c71bb98 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -397,7 +397,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,
@@ -412,14 +412,14 @@ 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                                                            */
   /*--------------------------------------------------------------------------*/
   *dstlen = srclen;
   dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen);
   if (dst != NULL) {
-    DBG(r,"end chxj_exchange_xhtml_mobile_1_0() (found qrcode.xml)");
+    DBG(r,"end chxj_convert_xhtml_mobile_1_0() (found qrcode.xml)");
     return dst;
   }
 
@@ -471,7 +471,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 9c27dd8..a54ae36 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -77,57 +77,57 @@ 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,
   },
   {
     /* CHXJ_SPEC_Jxtml            */
-    .converter = chxj_exchange_jhtml,
+    .converter = chxj_convert_jhtml,
     .encoder  = chxj_encoding,
   },
   {
@@ -208,8 +208,8 @@ chxj_headers_fixup(request_rec *r)
  * @param src [i]   It is former HTML character string. 
  * @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, cookie_t **cookiep)
+static char * 
+chxj_convert(request_rec *r, const char** src, apr_size_t* len, device_table *spec, const char *ua, cookie_t **cookiep)
 {
   char                *user_agent;
   char                *dst;
@@ -218,7 +218,7 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len, device_table *s
   mod_chxj_config     *dconf; 
   chxjconvrule_entry  *entryp;
 
-  DBG(r,"start of chxj_exchange() input:[%.*s]", (int)*len, *src);
+  DBG(r,"start of chxj_convert() input:[%.*s]", (int)*len, *src);
   dst  = apr_pstrcat(r->pool, (char*)*src, NULL);
 
   dconf = chxj_get_module_config(r->per_dir_config, &chxj_module);
@@ -245,7 +245,7 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len, device_table *s
   if (! STRNCASEEQ('t','T', "text/html", r->content_type, sizeof("text/html")-1)
   &&  ! STRNCASEEQ('a','A', "application/xhtml+xml", r->content_type, sizeof("application/xhtml+xml")-1)) {
     DBG(r,"no convert. content type is %s", r->content_type);
-    DBG(r,"end of chxj_exchange()");
+    DBG(r,"end of chxj_convert()");
     return (char*)*src;
   }
 
@@ -313,7 +313,7 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len, device_table *s
     *cookiep = cookie;
   }
 
-  DBG(r, "end of chxj_exchange()");
+  DBG(r, "end of chxj_convert()");
 
   return dst;
 }
@@ -781,7 +781,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
             && r->content_type 
             && (STRNCASEEQ('a','A',"application/xhtml+xml", r->content_type, sizeof("application/xhtml+xml")-1)
             ||  STRNCASEEQ('t','T',"text/html", r->content_type, sizeof("text/html")-1))) {
-          DBG(r, "detect exchange target:[%s]", r->content_type);
+          DBG(r, "detect convert target:[%s]", r->content_type);
 
           if (ctx->len) {
             char* tmp;
@@ -795,11 +795,11 @@ 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, 
-                                        (const char**)&tmp, 
-                                        (apr_size_t*)&ctx->len,
-                                        spec,
-                                        user_agent, &cookie);
+            ctx->buffer = chxj_convert(r, 
+                                       (const char**)&tmp, 
+                                       (apr_size_t*)&ctx->len,
+                                       spec,
+                                       user_agent, &cookie);
 
 #if 0
             DBG(r, "output data=[%.*s]", ctx->len,ctx->buffer);
@@ -808,11 +808,11 @@ 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, 
-                                        (const char**)&ctx->buffer, 
-                                        (apr_size_t*)&ctx->len,
-                                        spec,
-                                        user_agent, &cookie);
+            ctx->buffer = chxj_convert(r, 
+                                       (const char**)&ctx->buffer, 
+                                       (apr_size_t*)&ctx->len,
+                                       spec,
+                                       user_agent, &cookie);
 
           }
         }
@@ -881,7 +881,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
             memset(tmp, 0, ctx->len + 1);
             memcpy(tmp, ctx->buffer, ctx->len);
             ctx->buffer = 
-              chxj_exchange_image(r, 
+              chxj_convert_image(r, 
                                   (const char**)&tmp,
                                   (apr_size_t*)&ctx->len);
             if (ctx->buffer == NULL) {
@@ -1126,7 +1126,7 @@ chxj_input_filter(ap_filter_t*        f,
       );
   
     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);