* Writing is changed.

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

diff --git a/include/chxj_chtml10.h b/include/chxj_chtml10.h
index ecb6bf8..e68cd19 100644 (file)
--- a/include/chxj_chtml10.h
+++ b/include/chxj_chtml10.h
@@ -29,12 +29,12 @@ typedef struct _ctml10_t {
     int                out_len;
     int                pre_flag;
 
-    device_table_t*    spec;
+    device_table*      spec;
     mod_chxj_config*   conf;
 } chtml10_t;
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-char* chxj_exchange_chtml10( request_rec* r, device_table_t* spec, const char* src, apr_size_t srclen, apr_size_t *dstlen);
+char* chxj_exchange_chtml10( request_rec* r, device_table* spec, const char* src, apr_size_t srclen, apr_size_t *dstlen);
 #endif

diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 203cbeb..f44a0e0 100644 (file)
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -28,7 +28,7 @@ typedef struct _ctml20_t {
     int                out_len;
     int                pre_flag;
 
-    device_table_t*    spec;
+    device_table*      spec;
     mod_chxj_config*   conf;
 } chtml20_t;
 
@@ -38,7 +38,7 @@ typedef struct _ctml20_t {
 char*
 chxj_exchange_chtml20(
                   request_rec* r,
-                  device_table_t* spec,
+                  device_table* spec,
                   const char* src,
                   apr_size_t srclen,
                   apr_size_t *dstlen);

diff --git a/include/chxj_chtml30.h b/include/chxj_chtml30.h
index e914899..a7e0771 100644 (file)
--- a/include/chxj_chtml30.h
+++ b/include/chxj_chtml30.h
@@ -28,7 +28,7 @@ typedef struct _chtml30_t {
     int                out_len;
     int                pre_flag;
 
-    device_table_t*    spec;
+    device_table*      spec;
     mod_chxj_config*   conf;
 } chtml30_t;
 
@@ -38,7 +38,7 @@ typedef struct _chtml30_t {
 char*
 chxj_exchange_chtml30(
   request_rec*    r,
-  device_table_t* spec,
+  device_table*   spec,
   const char*     src,
   apr_size_t      srclen,
   apr_size_t*     dstlen);

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 7f04c41..542fdc4 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -86,14 +86,14 @@ typedef struct _hdml_t {
 
   int     hdml_end_flag;
 
-  device_table_t* spec;
+  device_table* spec;
 
   mod_chxj_config*  conf;
 } hdml_t;
 /*============================================================================*/
 /* Prototype declaration.                                                     */
 /*============================================================================*/
-char* chxj_exchange_hdml(request_rec* r, device_table_t* spec, const char* src, apr_size_t srclen, apr_size_t* dstlen) ;
+char* chxj_exchange_hdml(request_rec* r, device_table* spec, const char* src, apr_size_t srclen, apr_size_t* dstlen) ;
 char* qs_out_apr_pstrcat(request_rec* r, char* o, char* s, int* len);
 char* qs_conv_istyle_to_format(request_rec* r, char* is);
 

diff --git a/include/chxj_img_conv.h b/include/chxj_img_conv.h
index f895a2d..a7b1b06 100644 (file)
--- a/include/chxj_img_conv.h
+++ b/include/chxj_img_conv.h
@@ -18,5 +18,5 @@
 #define __CHXJ_IMG_CONV_H__
 #include "mod_chxj.h"
 
-char* chxj_img_conv(request_rec* r, device_table_t* spec, const char* s);
+char* chxj_img_conv(request_rec* r, device_table* spec, const char* s);
 #endif

diff --git a/include/chxj_jhtml.h b/include/chxj_jhtml.h
index 1a27b1d..a171753 100644 (file)
--- a/include/chxj_jhtml.h
+++ b/include/chxj_jhtml.h
@@ -28,7 +28,7 @@ typedef struct _jhtml_t {
     int   out_len;
     int   pre_flag;
 
-    device_table_t* spec;
+    device_table*    spec;
     mod_chxj_config* conf;
 } jhtml_t;
 
@@ -38,7 +38,7 @@ typedef struct _jhtml_t {
 char*
 chxj_exchange_jhtml(
   request_rec* r,
-  device_table_t* spec,
+  device_table* spec,
   const char* src,
   apr_size_t srclen,
   apr_size_t *dstlen);

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 7c9cc80..43573d9 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -80,16 +80,16 @@ typedef struct _device_table_t {
   int color;
   char* emoji_type;
 
-} device_table_t;
+} device_table;
 
 typedef struct device_table_list_t {
   struct device_table_list_t* next;
   char* pattern;
   ap_regex_t* regexp;
-  device_table_t* table;
-  device_table_t* tail;
+  device_table* table;
+  device_table* tail;
 } device_table_list_t;
 
-device_table_t* chxj_specified_device(request_rec* r, const char* user_agent);
+device_table* chxj_specified_device(request_rec* r, const char* user_agent);
 
 #endif

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index 849a3b7..865db98 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -39,7 +39,7 @@ char*    qs_get_selected_value(Doc* doc, Node* node, request_rec* r);
 char*    qs_alloc_zero_byte_string(request_rec* r);
 char*    qs_trim_string(request_rec* r, char* s);
 
-int chxj_chxjif_is_mine(device_table_t* spec, Doc* doc, Node* tag);
+int chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag);
 char* qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);
 char* qs_get_parse_attr(Doc* doc, Node* tag, request_rec* r);
 #endif

diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 195cbfc..ef40735 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -28,13 +28,13 @@ typedef struct _xhtml_t {
     int                out_len;
     int                pre_flag;
 
-    device_table_t*    spec;
+    device_table*    spec;
     mod_chxj_config*   conf;
 } xhtml_t;
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-char* chxj_exchange_xhtml_mobile_1_0(request_rec* r, device_table_t* spec, const char* src, apr_size_t srclen, apr_size_t *dstlen);
+char* chxj_exchange_xhtml_mobile_1_0(request_rec* r, device_table* spec, const char* src, apr_size_t srclen, apr_size_t *dstlen);
 
 #endif

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 5e517bd..3304c5b 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -189,7 +189,7 @@ typedef struct {
 
   char*                 image_cache_dir;
   char*                 image_copyright;
-  device_table_list_t*  devices;
+  device_table_list*    devices;
   emoji_t*              emoji;
   emoji_t*              emoji_tail;
   char*                 server_side_encoding;

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index edc8493..ed2e6b9 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -79,7 +79,7 @@ static char* s_chtml10_start_option_tag (chtml10_t* chtml, Node* node);
 static char* s_chtml10_end_option_tag   (chtml10_t* chtml, Node* node);
 static char* s_chtml10_start_div_tag    (chtml10_t* chtml, Node* node);
 static char* s_chtml10_end_div_tag      (chtml10_t* chtml, Node* node);
-static void  s_init_chtml10(chtml10_t* chtml, Doc* doc, request_rec* r, device_table_t* spec);
+static void  s_init_chtml10(chtml10_t* chtml, Doc* doc, request_rec* r, device_table* spec);
 static int   s_chtml10_search_emoji(chtml10_t* chtml, char* txt, char** rslt);
 static void  s_chtml10_chxjif_tag(chtml10_t* chtml, Node* node);
 
@@ -96,7 +96,7 @@ static void  s_chtml10_chxjif_tag(chtml10_t* chtml, Node* node);
 char*
 chxj_exchange_chtml10(
   request_rec* r,
-  device_table_t* spec,
+  device_table* spec,
   const char* src,
   apr_size_t srclen,
   apr_size_t *dstlen)
@@ -169,7 +169,7 @@ chxj_exchange_chtml10(
  * @param spec  [i]   The pointer to the device_table
  */
 static void
-s_init_chtml10(chtml10_t* chtml10, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_chtml10(chtml10_t* chtml10, Doc* doc, request_rec* r, device_table* spec)
 {
   memset(doc,   0, sizeof(Doc));
   memset(chtml10, 0, sizeof(chtml10_t));
@@ -614,7 +614,7 @@ s_chtml10_search_emoji(chtml10_t* chtml10, char* txt, char** rslt)
 {
   emoji_t*      ee;
   request_rec*  r;
-  device_table_t* spec;
+  device_table* spec;
   int           len;
 
   spec = chtml10->spec;

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index 182f5b7..65e6c7c 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -80,7 +80,7 @@ static char* s_chtml20_start_option_tag (chtml20_t* chtml, Node* node);
 static char* s_chtml20_end_option_tag   (chtml20_t* chtml, Node* node);
 static char* s_chtml20_start_div_tag    (chtml20_t* chtml, Node* node);
 static char* s_chtml20_end_div_tag      (chtml20_t* chtml, Node* node);
-static void  s_init_chtml20(chtml20_t* chtml, Doc* doc, request_rec* r, device_table_t* spec);
+static void  s_init_chtml20(chtml20_t* chtml, Doc* doc, request_rec* r, device_table* spec);
 static int   s_chtml20_search_emoji(chtml20_t* chtml, char* txt, char** rslt);
 static void  s_chtml20_chxjif_tag(chtml20_t* chtml, Node* node); 
 
@@ -96,7 +96,7 @@ static void  s_chtml20_chxjif_tag(chtml20_t* chtml, Node* node);
 char*
 chxj_exchange_chtml20(
   request_rec* r,
-  device_table_t* spec,
+  device_table* spec,
   const char* src,
   apr_size_t srclen,
   apr_size_t *dstlen)
@@ -168,7 +168,7 @@ chxj_exchange_chtml20(
  * @param spec  [i]   The pointer to the device_table
  */
 static void
-s_init_chtml20(chtml20_t* chtml20, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_chtml20(chtml20_t* chtml20, Doc* doc, request_rec* r, device_table* spec)
 {
   memset(doc,   0, sizeof(Doc));
   memset(chtml20, 0, sizeof(chtml20_t));
@@ -615,7 +615,7 @@ s_chtml20_search_emoji(chtml20_t* chtml20, char* txt, char** rslt)
 {
   emoji_t*      ee;
   request_rec*  r;
-  device_table_t* spec;
+  device_table* spec;
   int           len;
 
   spec = chtml20->spec;
@@ -1742,7 +1742,7 @@ s_chtml20_start_img_tag(chtml20_t* chtml20, Node* node)
   request_rec*  r   = doc->r;
   Attr* attr;
 #ifndef IMG_NOT_CONVERT_FILENAME
-  device_table_t* spec = chtml20->spec;
+  device_table* spec = chtml20->spec;
 #endif
 
   chtml20->out = apr_pstrcat(r->pool, chtml20->out, "<img", NULL);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index e1a1f55..0682503 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -80,7 +80,7 @@ static char* s_chtml30_start_option_tag (chtml30_t* chtml, Node* node);
 static char* s_chtml30_end_option_tag   (chtml30_t* chtml, Node* node);
 static char* s_chtml30_start_div_tag    (chtml30_t* chtml, Node* node);
 static char* s_chtml30_end_div_tag      (chtml30_t* chtml, Node* node);
-static void  s_init_chtml30(chtml30_t* chtml, Doc* doc, request_rec* r, device_table_t* spec);
+static void  s_init_chtml30(chtml30_t* chtml, Doc* doc, request_rec* r, device_table* spec);
 static int   s_chtml30_search_emoji(chtml30_t* chtml, char* txt, char** rslt);
 static void  s_chtml30_chxjif_tag(chtml30_t* chtml, Node* node); 
 
@@ -96,7 +96,7 @@ static void  s_chtml30_chxjif_tag(chtml30_t* chtml, Node* node);
 char*
 chxj_exchange_chtml30(
   request_rec* r,
-  device_table_t* spec,
+  device_table* spec,
   const char* src,
   apr_size_t srclen,
   apr_size_t *dstlen)
@@ -171,7 +171,7 @@ chxj_exchange_chtml30(
  * @param spec  [i]   The pointer to the device_table
  */
 static void
-s_init_chtml30(chtml30_t* chtml30, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_chtml30(chtml30_t* chtml30, Doc* doc, request_rec* r, device_table* spec)
 {
   memset(doc,   0, sizeof(Doc));
   memset(chtml30, 0, sizeof(chtml30_t));
@@ -622,7 +622,7 @@ s_chtml30_search_emoji(chtml30_t* chtml30, char* txt, char** rslt)
 {
   emoji_t*      ee;
   request_rec*  r;
-  device_table_t* spec;
+  device_table* spec;
   int           len;
 
   spec = chtml30->spec;
@@ -1644,7 +1644,7 @@ s_chtml30_start_img_tag(chtml30_t* chtml30, Node* node)
   request_rec*  r   = doc->r;
   Attr* attr;
 #ifndef IMG_NOT_CONVERT_FILENAME
-  device_table_t* spec = chtml30->spec;
+  device_table* spec = chtml30->spec;
 #endif
 
   chtml30->out = apr_pstrcat(r->pool, chtml30->out, "<img", NULL);

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 6ac6ec6..cc027bc 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -26,7 +26,7 @@
 #define RADIO_BUTTON_PREFIX  "_chxj_r_"
 #define SUBMIT_BUTTON_PREFIX "_chxj_s_"
 
-static void  s_init_hdml            (hdml_t* hdml, Doc* doc, request_rec* r, device_table_t* spec);
+static void  s_init_hdml            (hdml_t* hdml, Doc* doc, request_rec* r, device_table* spec);
 static char* s_hdml_node_exchange   (hdml_t* doc,  Node* node, int indent);
 static char* s_hdml_start_html_tag  (hdml_t* doc,  Node* node);
 static char* s_hdml_end_html_tag    (hdml_t* doc,  Node* node);
@@ -95,7 +95,7 @@ static void  s_hdml_chxjif_tag           (hdml_t* hdml, Node* node);
  */
 char*
 chxj_exchange_hdml(request_rec* r, 
-                   device_table_t* spec, 
+                   device_table* spec, 
                    const char* src, 
                    apr_size_t srclen, 
                    apr_size_t* dstlen)
@@ -213,7 +213,7 @@ chxj_exchange_hdml(request_rec* r,
  * @param spec [i]   The pointer to the device_table
  */
 static void 
-s_init_hdml(hdml_t* hdml, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_hdml(hdml_t* hdml, Doc* doc, request_rec* r, device_table* spec)
 {
   int     ii;
   int     jj;
@@ -620,7 +620,7 @@ s_hdml_search_emoji(hdml_t* hdml, char* txt, char** rslt)
 {
   emoji_t* ee;
   request_rec* r;
-  device_table_t* spec;
+  device_table* spec;
   int len;
 
   spec = hdml->spec;

diff --git a/src/chxj_img_conv.c b/src/chxj_img_conv.c
index 2aee97e..4a78f0d 100644 (file)
--- a/src/chxj_img_conv.c
+++ b/src/chxj_img_conv.c
@@ -18,7 +18,7 @@
 
 
 char* 
-chxj_img_conv(request_rec* r, device_table_t* spec, const char* s)
+chxj_img_conv(request_rec* r, device_table* spec, const char* s)
 {
   char* dst = apr_pstrdup(r->pool, s);
   if (spec) {

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index e45c1ea..e9943ad 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -67,7 +67,7 @@ typedef struct _query_string_param_t {
 /*----------------------------------------------------------------------------*/
 /* Device_spec when User-Agent is disregarded                                 */
 /*----------------------------------------------------------------------------*/
-static device_table_t v_ignore_spec = {
+static device_table v_ignore_spec = {
   NULL,
   "IGN",
   "IGN",
@@ -160,10 +160,10 @@ static char*        s_create_workfile(  request_rec*, mod_chxj_config* ,
                                         query_string_param_t*);
 static apr_status_t s_create_cache_file(request_rec* r, 
                                         const char* tmpfile, 
-                                        device_table_t* spec,
+                                        device_table* spec,
                                         apr_finfo_t* st,
                                         query_string_param_t *qsp);
-static apr_status_t s_send_cache_file(  device_table_t* spec,
+static apr_status_t s_send_cache_file(  device_table* spec,
                                         query_string_param_t* query_string,
                                         request_rec* r,
                                         const char* tmpfile);
@@ -172,22 +172,22 @@ static unsigned short s_add_crc(        const char* writedata,
                                         apr_size_t witebyte);
 static MagickWand* s_fixup_size(MagickWand* , 
                                         request_rec* r, 
-                                        device_table_t* spec, 
+                                        device_table* spec, 
                                         query_string_param_t *qsp);
 static MagickWand* s_fixup_color(MagickWand* magick_wand, 
                                  request_rec* r, 
-                                 device_table_t* spec, 
+                                 device_table* spec, 
                                  img_conv_mode_t mode);
 static MagickWand* s_fixup_depth(MagickWand* magick_wand, 
-                                 request_rec* r, device_table_t* spec);
+                                 request_rec* r, device_table* spec);
 static MagickWand* s_img_down_sizing(MagickWand* magick_wand, 
-                                request_rec* r, device_table_t* spec);
+                                request_rec* r, device_table* spec);
 static MagickWand* s_add_copyright(
                           MagickWand* magick_wand,
                           request_rec* r,
-                          device_table_t* spec);
+                          device_table* spec);
 static char* s_create_blob_data(request_rec* r,
-                   device_table_t* spec,
+                   device_table* spec,
                    query_string_param_t *qsp,
                    char* indata,
                    apr_size_t* len);
@@ -197,7 +197,7 @@ static int s_img_conv_format_from_file(
                 mod_chxj_config*    conf, 
                 const char*           user_agent,
                 query_string_param_t* qsp,
-                device_table_t*       spec);
+                device_table*       spec);
 
 int 
 chxj_img_conv_format_handler(request_rec* r)
@@ -205,7 +205,7 @@ chxj_img_conv_format_handler(request_rec* r)
   mod_chxj_config*      conf;
   query_string_param_t* qsp;
   char*                 user_agent;
-  device_table_t*       spec;
+  device_table*       spec;
   
   if ((*r->handler != 'c' && *r->handler != 'C') 
   ||  (strcasecmp(r->handler, "chxj-picture")
@@ -260,7 +260,7 @@ chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len)
   mod_chxj_config*      conf;
   query_string_param_t* qsp;
   char*                 user_agent;
-  device_table_t*       spec;
+  device_table*       spec;
   char*                 dst;
 
 
@@ -299,7 +299,7 @@ s_img_conv_format_from_file(
                 mod_chxj_config*    conf, 
                 const char*           user_agent,
                 query_string_param_t* qsp,
-                device_table_t*       spec)
+                device_table*       spec)
 {
   apr_status_t   rv;
   apr_finfo_t    st;
@@ -345,7 +345,7 @@ s_img_conv_format_from_file(
 static apr_status_t
 s_create_cache_file(request_rec*       r, 
                        const char*     tmpfile, 
-                       device_table_t* spec, 
+                       device_table* spec, 
                        apr_finfo_t*    st, 
                        query_string_param_t *qsp)
 {
@@ -622,7 +622,7 @@ s_create_cache_file(request_rec*       r,
 
 static char*
 s_create_blob_data(request_rec* r, 
-                   device_table_t* spec, 
+                   device_table* spec, 
                    query_string_param_t *qsp,
                    char* indata,
                    apr_size_t* len)
@@ -811,7 +811,7 @@ s_create_blob_data(request_rec* r,
 static MagickWand* 
 s_fixup_size(MagickWand* magick_wand, 
                 request_rec* r, 
-                device_table_t* spec, 
+                device_table* spec, 
                 query_string_param_t *qsp)
 {
   img_conv_mode_t mode = qsp->mode;
@@ -956,7 +956,7 @@ s_fixup_size(MagickWand* magick_wand,
 }
 
 static MagickWand*
-s_fixup_color(MagickWand* magick_wand, request_rec* r, device_table_t* spec, img_conv_mode_t mode)
+s_fixup_color(MagickWand* magick_wand, request_rec* r, device_table* spec, img_conv_mode_t mode)
 {
   DBG(r,"start chxj_fixup_clor()");
 
@@ -1002,7 +1002,7 @@ s_fixup_color(MagickWand* magick_wand, request_rec* r, device_table_t* spec, img
 
 
 static MagickWand*
-s_fixup_depth(MagickWand* magick_wand, request_rec* r, device_table_t* spec)
+s_fixup_depth(MagickWand* magick_wand, request_rec* r, device_table* spec)
 {
   if (spec->color == 15680000) {
     if (MagickSetImageDepth(magick_wand, 24) == MagickFalse) {
@@ -1058,7 +1058,7 @@ s_fixup_depth(MagickWand* magick_wand, request_rec* r, device_table_t* spec)
 
 
 static MagickWand*
-s_add_copyright(MagickWand* magick_wand, request_rec* r, device_table_t* spec)
+s_add_copyright(MagickWand* magick_wand, request_rec* r, device_table* spec)
 {
   mod_chxj_config* conf = ap_get_module_config(r->per_dir_config, &chxj_module);
 
@@ -1103,7 +1103,7 @@ on_error:
 }
 
 static MagickWand*
-s_img_down_sizing(MagickWand* magick_wand, request_rec* r, device_table_t* spec)
+s_img_down_sizing(MagickWand* magick_wand, request_rec* r, device_table* spec)
 {
   MagickBooleanType  status;
   unsigned long quality = 70;
@@ -1217,7 +1217,7 @@ s_img_down_sizing(MagickWand* magick_wand, request_rec* r, device_table_t* spec)
 }
 
 static apr_status_t 
-s_send_cache_file(device_table_t* spec, query_string_param_t* query_string, request_rec* r, const char* tmpfile)
+s_send_cache_file(device_table* spec, query_string_param_t* query_string, request_rec* r, const char* tmpfile)
 {
   apr_status_t rv;
   apr_finfo_t  st;

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 0cf9f63..cfde91a 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -67,7 +67,7 @@ static char* s_jhtml_start_option_tag (jhtml_t* jhtml, Node* node);
 static char* s_jhtml_end_option_tag   (jhtml_t* jhtml, Node* node);
 static char* s_jhtml_start_div_tag    (jhtml_t* jhtml, Node* node);
 static char* s_jhtml_end_div_tag      (jhtml_t* jhtml, Node* node);
-static void  s_init_jhtml(jhtml_t* jhtml, Doc* doc, request_rec* r, device_table_t* spec);
+static void  s_init_jhtml(jhtml_t* jhtml, Doc* doc, request_rec* r, device_table* spec);
 static int   s_jhtml_search_emoji(jhtml_t* jhtml, char* txt, char** rslt);
 static char* chxj_istyle_to_mode(request_rec* r, const char* s);
 static void  s_jhtml_chxjif_tag(jhtml_t* jhtml, Node* node); 
@@ -84,7 +84,7 @@ static void  s_jhtml_chxjif_tag(jhtml_t* jhtml, Node* node);
 char*
 chxj_exchange_jhtml(
   request_rec* r,
-  device_table_t* spec,
+  device_table* spec,
   const char* src,
   apr_size_t srclen,
   apr_size_t *dstlen)
@@ -160,7 +160,7 @@ chxj_exchange_jhtml(
  * @param spec  [i]   The pointer to the device_table
  */
 static void
-s_init_jhtml(jhtml_t* jhtml, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_jhtml(jhtml_t* jhtml, Doc* doc, request_rec* r, device_table* spec)
 {
   memset(doc,   0, sizeof(Doc));
   memset(jhtml, 0, sizeof(jhtml_t));
@@ -607,7 +607,7 @@ s_jhtml_search_emoji(jhtml_t* jhtml, char* txt, char** rslt)
 {
   emoji_t*      ee;
   request_rec*  r;
-  device_table_t* spec;
+  device_table* spec;
   int           len;
 
   spec = jhtml->spec;
@@ -1865,7 +1865,7 @@ s_jhtml_start_img_tag(jhtml_t* jhtml, Node* node)
   request_rec*  r   = doc->r;
   Attr* attr;
 #ifndef IMG_NOT_CONVERT_FILENAME
-  device_table_t* spec = jhtml->spec;
+  device_table* spec = jhtml->spec;
 #endif
 
   jhtml->out = apr_pstrcat(r->pool, jhtml->out, "<img", NULL);

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index b92830f..5aedd07 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -118,9 +118,9 @@ static void
 s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list_t* dtl, Node* node) 
 {
   Node* child;
-  device_table_t* dt;
+  device_table* dt;
 
-  dt = apr_pcalloc(p, sizeof(device_table_t));
+  dt = apr_pcalloc(p, sizeof(device_table));
   dt->next           = NULL;
   dt->device_id      = NULL;
   dt->device_name    = NULL;

diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c
index a77223f..f0573d0 100644 (file)
--- a/src/chxj_specified_device.c
+++ b/src/chxj_specified_device.c
@@ -16,7 +16,7 @@
  */
 #include "mod_chxj.h"
 
-static device_table_t  UNKNOWN_DEVICE      = {
+static device_table  UNKNOWN_DEVICE      = {
     NULL, "","UNKNOWN", CHXJ_SPEC_UNKNOWN,  0,  0,0,0,0,0,0,0,0,0,0,0,0, ""};
 
 /**
@@ -25,13 +25,13 @@ static device_table_t  UNKNOWN_DEVICE      = {
  * @param userAgent UserAgent is appointed here,
  * @return The style which corresponds is returned.
  */
-device_table_t*
+device_table*
 chxj_specified_device(request_rec* r, const char* user_agent) 
 {
   ap_regmatch_t        match[10];
-  device_table_t*      returnType = &UNKNOWN_DEVICE;
+  device_table*        returnType = &UNKNOWN_DEVICE;
   device_table_list_t* dtl;
-  device_table_t*      dt;
+  device_table*        dt;
   mod_chxj_config*     conf; 
   char*                device_id;
 

diff --git a/src/chxj_tag_util.c b/src/chxj_tag_util.c
index bd8013a..4eeed45 100644 (file)
--- a/src/chxj_tag_util.c
+++ b/src/chxj_tag_util.c
@@ -470,7 +470,7 @@ qs_is_checked_checkbox_attr(Doc* doc, Node* tag, request_rec* r)
 
 
 int
-chxj_chxjif_is_mine(device_table_t* spec, Doc* doc, Node* tag)
+chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag)
 {
   request_rec* r = doc->r;
   Attr* attr;

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 1765be8..232476b 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -82,7 +82,7 @@ static char* s_xhtml_1_0_start_option_tag (xhtml_t* xhtml, Node* node);
 static char* s_xhtml_1_0_end_option_tag   (xhtml_t* xhtml, Node* node);
 static char* s_xhtml_1_0_start_div_tag    (xhtml_t* xhtml, Node* node);
 static char* s_xhtml_1_0_end_div_tag      (xhtml_t* xhtml, Node* node);
-static void  s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table_t* spec);
+static void  s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table* spec);
 static int   s_xhtml_search_emoji(xhtml_t* xhtml, char* txt, char** rslt);
 static void  s_xhtml_1_0_chxjif_tag(xhtml_t* xhtml, Node* node);
  
@@ -98,7 +98,7 @@ static void  s_xhtml_1_0_chxjif_tag(xhtml_t* xhtml, Node* node);
 char*
 chxj_exchange_xhtml_mobile_1_0(
   request_rec*    r,
-  device_table_t* spec,
+  device_table*   spec,
   const char*     src,
   apr_size_t      srclen,
   apr_size_t*     dstlen)
@@ -178,7 +178,7 @@ chxj_exchange_xhtml_mobile_1_0(
  * @param spec  [i]   The pointer to the device_table
  */
 static void
-s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table_t* spec)
+s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table* spec)
 {
   memset(doc,   0, sizeof(Doc));
   memset(xhtml, 0, sizeof(xhtml_t));
@@ -630,7 +630,7 @@ s_xhtml_search_emoji(xhtml_t* xhtml, char* txt, char** rslt)
 {
   emoji_t*      ee;
   request_rec*  r;
-  device_table_t* spec;
+  device_table* spec;
   int           len;
 
   spec = xhtml->spec;

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 7e28404..5f81c58 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -101,7 +101,8 @@ chxj_exchange(request_rec *r, const char** src, apr_size_t* len)
   }
 
   if (!r->header_only) {
-    device_table_t* spec = chxj_specified_device(r, user_agent);
+    device_table* spec = chxj_specified_device(r, user_agent);
+
     switch(spec->html_spec_type) {
     case CHXJ_SPEC_Chtml_1_0:
       /*----------------------------------------------------------------------*/