* change writting.

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

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 7689cda..ab4a26a 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -40,7 +40,7 @@ extern char*
 chxj_add_cookie_parameter(
   request_rec* r, 
   char*        value, 
-  cookie_t* cookie);
+  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);
 extern apr_file_t* chxj_cookie_db_lock(request_rec* r);

diff --git a/include/chxj_encoding.h b/include/chxj_encoding.h
index 0d56830..57a6762 100644 (file)
--- a/include/chxj_encoding.h
+++ b/include/chxj_encoding.h
@@ -29,6 +29,7 @@ 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_encoding_parameter(request_rec* r, const char* value);

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 0dd8a4c..2391e4c 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -118,6 +118,7 @@ qs_out_apr_pstrcat(
   int*         len);
 
 extern char* 
-qs_conv_istyle_to_format(request_rec* r, char* is);
+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 2cf94cc..54629ed 100644 (file)
--- a/include/chxj_img_conv.h
+++ b/include/chxj_img_conv.h
@@ -20,7 +20,7 @@
 
 extern char* 
 chxj_img_conv(
-  request_rec* r, 
+  request_rec*  r, 
   device_table* spec, 
   const char*   s);
 #endif

diff --git a/include/chxj_img_conv_format.h b/include/chxj_img_conv_format.h
index 9d5cf20..43e9ce8 100644 (file)
--- a/include/chxj_img_conv_format.h
+++ b/include/chxj_img_conv_format.h
@@ -26,7 +26,8 @@ chxj_img_conv_format_handler(
   request_rec* r);
 extern char* 
 chxj_exchange_image(
-  request_rec *r, const char** src, apr_size_t* len);
+  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 1fd11b9..63784bb 100644 (file)
--- a/include/chxj_load_device_data.h
+++ b/include/chxj_load_device_data.h
@@ -21,7 +21,7 @@
 extern void 
 chxj_load_device_data(
   Doc* doc, 
-  apr_pool_t *p, 
+  apr_pool_t*      p, 
   mod_chxj_config* conf);
 
 #endif

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

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index ea36f97..312cd18 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -88,7 +88,7 @@ typedef struct device_table_list_t  device_table_list;
 
 struct device_table_list_t {
   struct device_table_list_t* next;
-  char* pattern;
+  char*       pattern;
   ap_regex_t* regexp;
   device_table* table;
   device_table* tail;

diff --git a/include/chxj_str_util.h b/include/chxj_str_util.h
index fffb505..1353266 100644 (file)
--- a/include/chxj_str_util.h
+++ b/include/chxj_str_util.h
@@ -21,6 +21,7 @@
 
 extern int 
 chxj_chk_numeric(const char* s);
+
 int chxj_atoi(const char* s);
 
 #endif

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

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 614dcda..d788a95 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -867,7 +867,7 @@ s_chtml30_start_body_tag(void* pdoc, Node* node)
     name   = qs_get_attr_name(doc,attr);
     value  = qs_get_attr_value(doc,attr);
 
-    if (strcasecmp(name, "bgcolor") == 0) {
+    if ((*name == 'b' || *name == 'B') && strcasecmp(name, "bgcolor") == 0) {
       /*----------------------------------------------------------------------*/
       /* CHTML 2.0                                                            */
       /*----------------------------------------------------------------------*/

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index ec3d82d..4cbb871 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -473,7 +473,7 @@ void
 chxj_delete_cookie(request_rec* r, char* cookie_id)
 {
   apr_status_t      retval;
-  apr_datum_t dbmkey;
+  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 35b372c..f704926 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -37,7 +37,7 @@ chxj_encoding(request_rec *r, const char* src, apr_size_t* len)
   char* ibuf;
   char* spos;
   
-  iconv_t cd;
+  iconv_t             cd;
   size_t              result;
   apr_size_t          ilen;
   apr_size_t          olen;

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 3d1fd22..19b31ac 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1256,6 +1256,7 @@ s_hdml_start_form_tag(void* pdoc, Node* node)
       break;
     }
   }
+
   if (act) {
     hdml->form_tmp = apr_pstrcat(r->pool,
                              hdml->form_tmp,

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