*** empty log message ***

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

diff --git a/src/chxj_chtml10.h b/src/chxj_chtml10.h
index b2bab7d..7f9eccf 100644 (file)
--- a/src/chxj_chtml10.h
+++ b/src/chxj_chtml10.h
@@ -29,7 +29,7 @@ typedef struct _Ctml10_t {
     int   out_len;
 
     device_table* spec;
-    mod_chxj_config* conf;
+    mod_chxj_config_t* conf;
 } chtml10_t;
 
 /*----------------------------------------------------------------------------*/

diff --git a/src/chxj_chtml20.h b/src/chxj_chtml20.h
index b937667..e1970b3 100644 (file)
--- a/src/chxj_chtml20.h
+++ b/src/chxj_chtml20.h
@@ -28,7 +28,7 @@ typedef struct _ctml20_t {
     int   out_len;
 
     device_table* spec;
-    mod_chxj_config* conf;
+    mod_chxj_config_t* conf;
 } chtml20_t;
 
 /*----------------------------------------------------------------------------*/

diff --git a/src/chxj_chtml30.h b/src/chxj_chtml30.h
index 2e73cd8..bed4fe0 100644 (file)
--- a/src/chxj_chtml30.h
+++ b/src/chxj_chtml30.h
@@ -28,7 +28,7 @@ typedef struct _chtml30_t {
     int   out_len;
 
     device_table* spec;
-    mod_chxj_config* conf;
+    mod_chxj_config_t* conf;
 } chtml30_t;
 
 /*----------------------------------------------------------------------------*/

diff --git a/src/chxj_hdml.h b/src/chxj_hdml.h
index b0fe9cf..69ae964 100644 (file)
--- a/src/chxj_hdml.h
+++ b/src/chxj_hdml.h
@@ -88,7 +88,7 @@ typedef struct _hdml_t {
 
   device_table* spec;
 
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
 } hdml_t;
 /*============================================================================*/
 /* Prototype declaration.                                                     */

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index b61ac72..b54f4fd 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -155,7 +155,7 @@ static const char* HDML_FAIL_PAGE =
 /*----------------------------------------------------------------------------*/
 /* Prototype declaration                                                      */
 /*----------------------------------------------------------------------------*/
-static char*        s_create_workfile(  request_rec*, mod_chxj_config* , 
+static char*        s_create_workfile(  request_rec*, mod_chxj_config_t* , 
                                         const char*, 
                                         query_string_param_t*);
 static apr_status_t s_create_cache_file(request_rec* r, 
@@ -194,7 +194,7 @@ static char* s_create_blob_data(request_rec* r,
 
 static int s_img_conv_format_from_file(
                 request_rec*          r, 
-                mod_chxj_config*      conf, 
+                mod_chxj_config_t*      conf, 
                 const char*           user_agent,
                 query_string_param_t* qsp,
                 device_table*         spec);
@@ -202,7 +202,7 @@ static int s_img_conv_format_from_file(
 int 
 chxj_img_conv_format_handler(request_rec* r)
 {
-  mod_chxj_config*      conf;
+  mod_chxj_config_t*      conf;
   query_string_param_t* qsp;
   char*                 user_agent;
   device_table*         spec;
@@ -270,7 +270,7 @@ chxj_img_conv_format_handler(request_rec* r)
 char*
 chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len)
 {
-  mod_chxj_config*      conf;
+  mod_chxj_config_t*      conf;
   query_string_param_t* qsp;
   char*                 user_agent;
   device_table*         spec;
@@ -323,7 +323,7 @@ chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len)
 static int
 s_img_conv_format_from_file(
                 request_rec*          r, 
-                mod_chxj_config*      conf, 
+                mod_chxj_config_t*      conf, 
                 const char*           user_agent,
                 query_string_param_t* qsp,
                 device_table*         spec)
@@ -1193,7 +1193,7 @@ static MagickWand*
 s_add_copyright(MagickWand* magick_wand, request_rec* r, device_table* spec)
 {
   MagickBooleanType  status;
-  mod_chxj_config* conf = ap_get_module_config(r->per_dir_config, &chxj_module);
+  mod_chxj_config_t* conf = ap_get_module_config(r->per_dir_config, &chxj_module);
   if (conf->image_copyright != NULL)
   {
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Add COPYRIGHT [%s]", conf->image_copyright);
@@ -1505,7 +1505,7 @@ s_send_cache_file(device_table* spec, query_string_param_t* query_string, reques
 static char*
 s_create_workfile(
                 request_rec*          r, 
-                mod_chxj_config*      conf, 
+                mod_chxj_config_t*      conf, 
                 const char*           user_agent, 
                 query_string_param_t *qsp)
 {
@@ -1589,7 +1589,7 @@ chxj_trans_name(request_rec *r)
   int len;
   apr_finfo_t st;
   apr_status_t rv;
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
   int ii;
   char*      ext[] = {
           "jpg",

diff --git a/src/chxj_jhtml.h b/src/chxj_jhtml.h
index a91c045..7fd804c 100644 (file)
--- a/src/chxj_jhtml.h
+++ b/src/chxj_jhtml.h
@@ -28,7 +28,7 @@ typedef struct _jhtml_t {
     int   out_len;
 
     device_table* spec;
-    mod_chxj_config* conf;
+    mod_chxj_config_t* conf;
 } jhtml_t;
 
 /*----------------------------------------------------------------------------*/

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index c09677e..47f4b29 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -26,14 +26,14 @@
 #include "chxj_str_util.h"
 
 
-static void s_set_devices_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) ;
-static void s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) ;
+static void s_set_devices_data(Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node) ;
+static void s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node) ;
 static void s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list* dtl, Node* node) ;
 /**
  * load device_data.xml
  */
 void
-chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf) 
+chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config_t* conf) 
 {
   conf->devices = NULL;
   s_set_devices_data(doc, p, conf,qs_get_root(doc));
@@ -66,7 +66,7 @@ chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf)
  * <devices>
  */
 static void
-s_set_devices_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) 
+s_set_devices_data(Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node) 
 {
   Node* child;
   for (child = qs_get_child_node(doc,node); 
@@ -85,7 +85,7 @@ s_set_devices_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node)
  * <user_agent>
  */
 static void
-s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) 
+s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node) 
 {
   Node* child;
   device_table_list* t;

diff --git a/src/chxj_load_device_data.h b/src/chxj_load_device_data.h
index e19e555..a4164ba 100644 (file)
--- a/src/chxj_load_device_data.h
+++ b/src/chxj_load_device_data.h
@@ -18,6 +18,6 @@
 #define __LOAD_DEVICE_DATA_H__
 #include "mod_chxj.h"
 
-void chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
+void chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config_t* conf);
 
 #endif

diff --git a/src/chxj_load_emoji_data.c b/src/chxj_load_emoji_data.c
index 0982c6f..db51dbb 100644 (file)
--- a/src/chxj_load_emoji_data.c
+++ b/src/chxj_load_emoji_data.c
@@ -18,10 +18,10 @@
 #include "mod_chxj.h"
 #include "chxj_load_emoji_data.h"
 
-static char* s_load_emoji_set_tag( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node);
-static char* s_set_emoji_data( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node);
-static char* s_load_emoji_emoji_tag( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node);
-static void  s_emoji_add_to_tail( mod_chxj_config* conf, emoji_t* emoji);
+static char* s_load_emoji_set_tag( Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node);
+static char* s_set_emoji_data( Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node);
+static char* s_load_emoji_emoji_tag( Doc* doc, apr_pool_t* p, mod_chxj_config_t* conf, Node* node);
+static void  s_emoji_add_to_tail( mod_chxj_config_t* conf, emoji_t* emoji);
 static char* s_load_emoji_no_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
 static char* s_load_emoji_imode_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
 static char* s_load_emoji_ezweb_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
@@ -36,7 +36,7 @@ char*
 chxj_load_emoji_data(
   Doc* doc,
   apr_pool_t *p,
-  mod_chxj_config* conf) 
+  mod_chxj_config_t* conf) 
 {
   char* rtn;
 
@@ -58,7 +58,7 @@ static char*
 s_set_emoji_data(
   Doc* doc,
   apr_pool_t* p,
-  mod_chxj_config* conf,
+  mod_chxj_config_t* conf,
   Node* node) 
 {
   Node* child;
@@ -85,7 +85,7 @@ static char*
 s_load_emoji_emoji_tag(
   Doc* doc,
   apr_pool_t* p,
-  mod_chxj_config* conf,
+  mod_chxj_config_t* conf,
   Node* node)
 {
   Node* child;
@@ -112,7 +112,7 @@ static char*
 s_load_emoji_set_tag(
   Doc* doc,
   apr_pool_t* p,
-  mod_chxj_config* conf,
+  mod_chxj_config_t* conf,
   Node* node)
 {
   Node* child;
@@ -469,7 +469,7 @@ s_load_emoji_jphone_tag(
 
 static void
 s_emoji_add_to_tail(
-  mod_chxj_config* conf,
+  mod_chxj_config_t* conf,
   emoji_t* emoji)
 {
   emoji->next = NULL;

diff --git a/src/chxj_load_emoji_data.h b/src/chxj_load_emoji_data.h
index 2439bcd..c31e262 100644 (file)
--- a/src/chxj_load_emoji_data.h
+++ b/src/chxj_load_emoji_data.h
@@ -21,6 +21,6 @@
 #define ESCAPE_CHAR_GT ">"
 
 
-char* chxj_load_emoji_data( Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
+char* chxj_load_emoji_data( Doc* doc, apr_pool_t *p, mod_chxj_config_t* conf);
 
 #endif

diff --git a/src/chxj_qr_code.c b/src/chxj_qr_code.c
index 77f3b27..0734455 100644 (file)
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -588,7 +588,7 @@ chxj_qr_code_handler(request_rec* r)
   Doc                doc;
   char*              img;
   Node*              root;
-  mod_chxj_config*   conf;
+  mod_chxj_config_t* conf;
 
 #ifdef QR_CODE_DEBUG
   ap_log_rerror(APLOG_MARK,APLOG_DEBUG, 0, r,

diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c
index f875532..3761fb5 100644 (file)
--- a/src/chxj_specified_device.c
+++ b/src/chxj_specified_device.c
@@ -34,7 +34,7 @@ chxj_specified_device(request_rec* r, const char* user_agent)
   device_table *returnType = &UNKNOWN_DEVICE;
   device_table_list* dtl;
   device_table* dt;
-  mod_chxj_config* conf; 
+  mod_chxj_config_t* conf; 
   int rtn;
   char* device_id;
 

diff --git a/src/chxj_xhtml_mobile_1_0.h b/src/chxj_xhtml_mobile_1_0.h
index 0f3c32a..49f1e8c 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.h
+++ b/src/chxj_xhtml_mobile_1_0.h
@@ -22,13 +22,13 @@
 /*----------------------------------------------------------------------------*/
 /* Structure for HDML                                                         */
 /*----------------------------------------------------------------------------*/
-typedef struct _Xhtml_t {
+typedef struct _xhtml_t {
     Doc* doc;
     char* out;
     int   out_len;
 
     device_table* spec;
-    mod_chxj_config* conf;
+    mod_chxj_config_t* conf;
 } xhtml_t;
 
 /*----------------------------------------------------------------------------*/

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 7d41ee8..5249943 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -700,9 +700,9 @@ chxj_register_hooks(apr_pool_t *p)
 static void* 
 chxj_create_per_dir_config(apr_pool_t *p, char *arg) 
 {
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
 
-  conf = apr_pcalloc(p, sizeof(mod_chxj_config));
+  conf = apr_pcalloc(p, sizeof(mod_chxj_config_t));
   conf->device_data_file = NULL;
   conf->devices          = NULL;
   conf->emoji_data_file  = NULL;
@@ -721,9 +721,9 @@ chxj_create_per_dir_config(apr_pool_t *p, char *arg)
 static void*
 chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
 {
-  mod_chxj_config *base = (mod_chxj_config*)basev;
-  mod_chxj_config *add  = (mod_chxj_config*)addv;
-  mod_chxj_config *mrg  = (mod_chxj_config*)apr_palloc(p, sizeof(mod_chxj_config));
+  mod_chxj_config_t *base = (mod_chxj_config_t*)basev;
+  mod_chxj_config_t *add  = (mod_chxj_config_t*)addv;
+  mod_chxj_config_t *mrg  = (mod_chxj_config_t*)apr_palloc(p, sizeof(mod_chxj_config_t));
 
   mrg->device_data_file = NULL;
   mrg->devices          = NULL;
@@ -796,7 +796,7 @@ chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
 static const char* 
 cmd_load_device_data(cmd_parms *parms, void *mconfig, const char* arg) 
 {
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
   Doc doc;
   doc.r = NULL;
   if (strlen(arg) > 256) 
@@ -804,7 +804,7 @@ cmd_load_device_data(cmd_parms *parms, void *mconfig, const char* arg)
     return "device data filename too long.";
   }
 
-  conf = (mod_chxj_config*)mconfig;
+  conf = (mod_chxj_config_t*)mconfig;
   conf->device_data_file = apr_pstrdup(parms->pool, arg);
 
   qs_init_malloc(&doc);
@@ -827,7 +827,7 @@ cmd_load_device_data(cmd_parms *parms, void *mconfig, const char* arg)
 static const char* 
 cmd_load_emoji_data(cmd_parms *parms, void *mconfig, const char* arg) 
 {
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
   char* rtn;
   Doc doc;
   doc.r = NULL;
@@ -837,7 +837,7 @@ cmd_load_emoji_data(cmd_parms *parms, void *mconfig, const char* arg)
     return "emoji data filename too long.";
   }
 
-  conf = (mod_chxj_config*)mconfig;
+  conf = (mod_chxj_config_t*)mconfig;
   conf->emoji_data_file = apr_pstrdup(parms->pool, arg);
   qs_init_malloc(&doc);
   qs_init_root_node(&doc);
@@ -852,7 +852,7 @@ cmd_load_emoji_data(cmd_parms *parms, void *mconfig, const char* arg)
 static const char* 
 cmd_set_image_engine(cmd_parms *parms, void *mconfig, const char* arg) 
 {
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
   Doc doc;
   doc.r = NULL;
   if (strlen(arg) > 256) 
@@ -860,7 +860,7 @@ cmd_set_image_engine(cmd_parms *parms, void *mconfig, const char* arg)
     return "image uri is too long.";
   }
 
-  conf = (mod_chxj_config*)mconfig;
+  conf = (mod_chxj_config_t*)mconfig;
   if (strcasecmp("ON", arg) == 0)
   {
     conf->image = CHXJ_IMG_ON;
@@ -875,7 +875,7 @@ cmd_set_image_engine(cmd_parms *parms, void *mconfig, const char* arg)
 static const char* 
 cmd_set_image_cache_dir(cmd_parms *parms, void *mconfig, const char* arg) 
 {
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
   Doc doc;
   doc.r = NULL;
   if (strlen(arg) > 256) 
@@ -883,7 +883,7 @@ cmd_set_image_cache_dir(cmd_parms *parms, void *mconfig, const char* arg)
     return "cache dir name is too long.";
   }
 
-  conf = (mod_chxj_config*)mconfig;
+  conf = (mod_chxj_config_t*)mconfig;
   conf->image_cache_dir = apr_pstrdup(parms->pool, arg);
   return NULL;
 }
@@ -891,7 +891,7 @@ cmd_set_image_cache_dir(cmd_parms *parms, void *mconfig, const char* arg)
 static const char* 
 cmd_set_image_copyright(cmd_parms *parms, void *mconfig, const char* arg) 
 {
-  mod_chxj_config* conf;
+  mod_chxj_config_t* conf;
   Doc doc;
 
   doc.r = NULL;
@@ -900,7 +900,7 @@ cmd_set_image_copyright(cmd_parms *parms, void *mconfig, const char* arg)
     return "Copyright Flag is too long.";
   }
 
-  conf = (mod_chxj_config*)mconfig;
+  conf = (mod_chxj_config_t*)mconfig;
   conf->image_copyright = apr_pstrdup(parms->pool, arg);
   return NULL;
 }

diff --git a/src/mod_chxj.h b/src/mod_chxj.h
index ebb0b36..37094da 100644 (file)
--- a/src/mod_chxj.h
+++ b/src/mod_chxj.h
@@ -84,7 +84,7 @@ typedef struct _mod_chxj_config_t
   emoji_t*            emoji;
   emoji_t*            emoji_tail;
 
-} mod_chxj_config;
+} mod_chxj_config_t;
 
 typedef struct _mod_chxj_global_config_t
 {