* change writting.

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

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 7a99a3e..f8a5139 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -91,19 +91,21 @@ typedef struct _device_table_list_t {
   device_table* tail;
 } device_table_list;
 
-typedef struct _exchange_t {
+typedef struct _converter_t {
   /* convert routine */
-  char* (*exchange)(request_rec* r,
-                    struct _device_table_t* spec,
-                    const char* src, 
-                    apr_size_t srclen, 
-                    apr_size_t *dstlen,
+  char* (*converter)(request_rec*               r,
+                    struct _device_table_t*     spec,
+                    const char*                 src, 
+                    apr_size_t                  srclen, 
+                    apr_size_t*                 dstlen,
                     struct _chxjconvrule_entry* entryp);
 
-  char* (*encoder)(request_rec *r, const char* src, apr_size_t* len);
-} exchange_t;
+  char* (*encoder)(request_rec* r,
+                   const char*  src,
+                   apr_size_t*  len);
+} converter_t;
 
-extern exchange_t exchange_routine[];
+extern converter_t convert_routine[];
 
 device_table* chxj_specified_device(request_rec* r, const char* user_agent);
 

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 0420070..9d549c2 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -61,55 +61,55 @@
 #define CHXJ_VERSION_PREFIX PACKAGE_NAME "/"
 #define CHXJ_VERSION        PACKAGE_VERSION
 
-exchange_t exchange_routine[] = {
+converter_t convert_routine[] = {
   {
     /* CHXJ_SPEC_UNKNOWN          */
-    .exchange = NULL,
+    .converter = NULL,
     .encoder  = NULL,
   },
   {
     /* CHXJ_SPEC_Chtml_1_0        */
-    .exchange = chxj_exchange_chtml10,
+    .converter = chxj_exchange_chtml10,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_2_0        */
-    .exchange = chxj_exchange_chtml20,
+    .converter = chxj_exchange_chtml20,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_3_0        */
-    .exchange = chxj_exchange_chtml30,
+    .converter = chxj_exchange_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_4_0        */
-    .exchange = chxj_exchange_chtml30,
+    .converter = chxj_exchange_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Chtml_5_0        */
-    .exchange = chxj_exchange_chtml30,
+    .converter = chxj_exchange_chtml30,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_XHtml_Mobile_1_0 */
-    .exchange = chxj_exchange_xhtml_mobile_1_0,
+    .converter = chxj_exchange_xhtml_mobile_1_0,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Hdml             */
-    .exchange = chxj_exchange_hdml,
+    .converter = chxj_exchange_hdml,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_Jhtml            */
-    .exchange = chxj_exchange_jhtml,
+    .converter = chxj_exchange_jhtml,
     .encoder  = chxj_encoding,
   },
   {
     /* CHXJ_SPEC_HTML             */
-    .exchange = NULL,
+    .converter = NULL,
     .encoder  = NULL,
   },
   {
@@ -217,14 +217,14 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len)
     device_table* spec = chxj_specified_device(r, user_agent);
 
     tmp = NULL;
-    if (exchange_routine[spec->html_spec_type].encoder)
-      tmp = exchange_routine[spec->html_spec_type].encoder(r, *src, (apr_size_t*)len);
+    if (convert_routine[spec->html_spec_type].encoder)
+      tmp = convert_routine[spec->html_spec_type].encoder(r, *src, (apr_size_t*)len);
 
-    if (exchange_routine[spec->html_spec_type].exchange) {
+    if (convert_routine[spec->html_spec_type].converter) {
       if (tmp)
-        dst = exchange_routine[spec->html_spec_type].exchange(r, spec, tmp, *len, len, entryp);
+        dst = convert_routine[spec->html_spec_type].converter(r, spec, tmp, *len, len, entryp);
       else
-        dst = exchange_routine[spec->html_spec_type].exchange(r, spec, *src, *len, len, entryp);
+        dst = convert_routine[spec->html_spec_type].converter(r, spec, *src, *len, len, entryp);
     }
   }
 
@@ -354,7 +354,7 @@ chxj_input_convert(
 
   result = qs_alloc_zero_byte_string(r);
 
-  DBG1(r, "BEFORE input exchange source = [%s]", s);
+  DBG1(r, "BEFORE input convert source = [%s]", s);
 
   /* _chxj_dmy */
   /* _chxj_c_ */
@@ -429,7 +429,7 @@ chxj_input_convert(
   }
   *len = strlen(result);
 
-  DBG1(r, "AFTER input exchange result = [%s]", result);
+  DBG1(r, "AFTER input convert result = [%s]", result);
 
   return result;
 }