* change writting.

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

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 5f21017..7689cda 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -39,7 +39,7 @@ chxj_save_cookie(
 extern char*     
 chxj_add_cookie_parameter(
   request_rec* r, 
-  char* value, 
+  char*        value, 
   cookie_t* cookie);
 extern int       chxj_cookie_check_host(request_rec* r, char* value);
 extern cookie_t* chxj_load_cookie(request_rec* r, char* cookie_id);

diff --git a/include/chxj_encoding.h b/include/chxj_encoding.h
index 1cd744b..0d56830 100644 (file)
--- a/include/chxj_encoding.h
+++ b/include/chxj_encoding.h
@@ -29,7 +29,8 @@ chxj_encoding(
   request_rec* r, 
   const char*  src, 
   apr_size_t*  len);
-extern char* chxj_rencoding(request_rec *r, const char* src, apr_size_t* len);
+extern char* 
+chxj_rencoding(request_rec *r, const char* src, apr_size_t* len);
 extern char* chxj_encoding_parameter(request_rec* r, const char* value);
 #endif
 

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 6c2cfdc..0dd8a4c 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -117,6 +117,7 @@ qs_out_apr_pstrcat(
   char*        s, 
   int*         len);
 
-extern char* qs_conv_istyle_to_format(request_rec* r, char* is);
+extern char* 
+qs_conv_istyle_to_format(request_rec* r, char* is);
 
 #endif

diff --git a/include/chxj_img_conv.h b/include/chxj_img_conv.h
index 70457fa..2cf94cc 100644 (file)
--- a/include/chxj_img_conv.h
+++ b/include/chxj_img_conv.h
@@ -22,5 +22,5 @@ extern char*
 chxj_img_conv(
   request_rec* r, 
   device_table* spec, 
-  const char* s);
+  const char*   s);
 #endif

diff --git a/include/chxj_img_conv_format.h b/include/chxj_img_conv_format.h
index 936cc59..9d5cf20 100644 (file)
--- a/include/chxj_img_conv_format.h
+++ b/include/chxj_img_conv_format.h
@@ -25,7 +25,8 @@ extern int
 chxj_img_conv_format_handler(
   request_rec* r);
 extern char* 
-chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len);
+chxj_exchange_image(
+  request_rec *r, const char** src, apr_size_t* len);
 int chxj_trans_name(request_rec *r);
 
 

diff --git a/include/chxj_load_device_data.h b/include/chxj_load_device_data.h
index 6fe4795..1fd11b9 100644 (file)
--- a/include/chxj_load_device_data.h
+++ b/include/chxj_load_device_data.h
@@ -21,6 +21,7 @@
 extern void 
 chxj_load_device_data(
   Doc* doc, 
-  apr_pool_t *p, mod_chxj_config* conf);
+  apr_pool_t *p, 
+  mod_chxj_config* conf);
 
 #endif

diff --git a/include/chxj_load_emoji_data.h b/include/chxj_load_emoji_data.h
index 2439bcd..55c368a 100644 (file)
--- a/include/chxj_load_emoji_data.h
+++ b/include/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);
+extern char* chxj_load_emoji_data( Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
 
 #endif

diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h
index 8eb54fa..476c792 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -106,7 +106,7 @@ typedef struct _qr_code_t {
   qr_code_found_t  found;
   qr_mode_change_t mode_change;
 
-  qr_ver_t     version;
+  qr_ver_t         version;
   qr_level_t   level;
   qr_mode_t    mode;
   request_rec* r;

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index fc23e28..ea36f97 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -84,8 +84,10 @@ struct device_table_t {
   char* emoji_type;
 };
 
-typedef struct _device_table_list_t {
-  struct _device_table_list_t* next;
+typedef struct device_table_list_t  device_table_list;
+
+struct device_table_list_t {
+  struct device_table_list_t* next;
   char* pattern;
   ap_regex_t* regexp;
   device_table* table;

diff --git a/include/chxj_str_util.h b/include/chxj_str_util.h
index 92f9d68..fffb505 100644 (file)
--- a/include/chxj_str_util.h
+++ b/include/chxj_str_util.h
@@ -19,7 +19,8 @@
 
 #include <string.h>
 
-extern int chxj_chk_numeric(const char* s);
+extern int 
+chxj_chk_numeric(const char* s);
 int chxj_atoi(const char* s);
 
 #endif

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index 865db98..245ad22 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -22,7 +22,7 @@
 /*----------------------------------------------------------------------------*/
 /* prototype declare                                                          */
 /*----------------------------------------------------------------------------*/
-char*    qs_get_value_attr     (Doc* doc, Node* tag, request_rec* r);
+extern char*    qs_get_value_attr     (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_checked_attr   (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_type_attr      (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_name_attr      (Doc* doc, Node* tag, request_rec* r);

diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index f64c255..4dac2cb 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -44,7 +44,7 @@ chxj_exchange_xhtml_mobile_1_0(
   request_rec* r,
   device_table* spec,
   const char* src,
-  apr_size_t srclen,
+  apr_size_t          srclen,
   apr_size_t*         dstlen,
   chxjconvrule_entry* entryp,
   cookie_t*           cookie);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index ef9ddfb..614dcda 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -864,7 +864,7 @@ s_chtml30_start_body_tag(void* pdoc, Node* node)
     char* name;
     char* value;
 
-    name  = qs_get_attr_name(doc,attr);
+    name   = qs_get_attr_name(doc,attr);
     value  = qs_get_attr_value(doc,attr);
 
     if (strcasecmp(name, "bgcolor") == 0) {

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index d853c2b..ec3d82d 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -472,7 +472,7 @@ chxj_cookie_db_unlock(request_rec* r, apr_file_t* file)
 void
 chxj_delete_cookie(request_rec* r, char* cookie_id)
 {
-  apr_status_t        retval;
+  apr_status_t      retval;
   apr_datum_t dbmkey;
   apr_dbm_t*          f;
   apr_file_t*       file;

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index 1d75196..35b372c 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -38,7 +38,7 @@ chxj_encoding(request_rec *r, const char* src, apr_size_t* len)
   char* spos;
   
   iconv_t cd;
-  size_t result;
+  size_t              result;
   apr_size_t          ilen;
   apr_size_t          olen;
   mod_chxj_config*    dconf;

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 7d4d3b8..3d1fd22 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1248,7 +1248,7 @@ s_hdml_start_form_tag(void* pdoc, Node* node)
     char* name;
     char* value;
 
-    name = qs_get_attr_name(doc,attr);
+    name  = qs_get_attr_name(doc,attr);
     value = qs_get_attr_value(doc,attr);
 
     if ((*name == 'a' || *name == 'A') && strcasecmp(name, "action") == 0) {

diff --git a/src/chxj_img_conv.c b/src/chxj_img_conv.c
index 0132235..1c10ccc 100644 (file)
--- a/src/chxj_img_conv.c
+++ b/src/chxj_img_conv.c
@@ -19,7 +19,8 @@
 
 char* 
 chxj_img_conv(
-  request_rec* r, device_table* spec, const char* s)
+  request_rec* r, 
+  device_table* spec, const char* s)
 {
   char* dst;
 

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 7abc79a..ef5d24d 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -161,7 +161,8 @@ 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* , 
                                         const char*, 
                                         query_string_param_t*);
 static apr_status_t s_create_cache_file(request_rec* r, 

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index ae3851e..c9e53f5 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -905,7 +905,7 @@ s_jhtml_start_body_tag(void* pdoc, Node* node)
       /*----------------------------------------------------------------------*/
       jhtml->out = apr_pstrcat(r->pool, 
                               jhtml->out, 
-                      " link=\"", 
+                              " link=\"", 
                       value, 
                       "\"", 
                       NULL);