* change writting.

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

diff --git a/include/chxj_apply_convrule.h b/include/chxj_apply_convrule.h
index bc858d5..de31345 100644 (file)
--- a/include/chxj_apply_convrule.h
+++ b/include/chxj_apply_convrule.h
@@ -21,8 +21,8 @@
 
 extern chxjconvrule_entry* 
 chxj_apply_convrule(
-  request_rec *r, 
-  apr_array_header_t *convrules);
+  request_rec*        r, 
+  apr_array_header_t* convrules);
 
 #endif
 /*

diff --git a/include/chxj_calc_ecc.h b/include/chxj_calc_ecc.h
index 586a95b..e92b467 100644 (file)
--- a/include/chxj_calc_ecc.h
+++ b/include/chxj_calc_ecc.h
@@ -21,7 +21,7 @@
 extern int 
 chxj_calc_ecc(
   qr_code_t* qrcode,
-              unsigned char* indata, 
+  unsigned char* indata, 
               unsigned char* dst);
 #endif
 /*

diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 02af4b7..251d5a5 100644 (file)
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -50,5 +50,5 @@ chxj_exchange_chtml20(
   apr_size_t          srclen,
   apr_size_t*         dstlen,
   chxjconvrule_entry* entryp,
-  cookie_t* cookie);
+  cookie_t*           cookie);
 #endif

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 34b79b4..ff1684a 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -33,7 +33,9 @@ struct cookie_t {
 };
 
 extern cookie_t* 
-chxj_save_cookie(request_rec *r);
+chxj_save_cookie(
+  request_rec *r);
+
 extern char*     chxj_add_cookie_parameter(request_rec* r, 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_dump.h b/include/chxj_dump.h
index 4672cd1..7eb974a 100644 (file)
--- a/include/chxj_dump.h
+++ b/include/chxj_dump.h
@@ -19,6 +19,7 @@
 
 extern void 
 chxj_dump_out(
-  const char* title, const char* s, int slen);
+  const char* title, 
+  const char* s, int slen);
 
 #endif

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 30af1f0..9e698fc 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -112,7 +112,8 @@ extern char* chxj_exchange_hdml(
 
 extern char* 
 qs_out_apr_pstrcat(
-  request_rec* r, char* o, char* s, int* len);
+  request_rec* r, 
+  char* o, char* s, int* len);
 extern char* qs_conv_istyle_to_format(request_rec* r, char* is);
 
 #endif

diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 33fec4b..cca0fb9 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -26,7 +26,7 @@ typedef struct xhtml_t xhtml_t;
 struct xhtml_t {
     Doc*               doc;
     char*              out;
-    int                out_len;
+    int                 out_len;
     int                 pre_flag;
     int                 textarea_flag;
 

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 9867f95..b02f16a 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -798,7 +798,7 @@ s_chtml30_start_base_tag(void* pdoc, Node* node)
     name = qs_get_attr_name(doc,attr);
     value = qs_get_attr_value(doc,attr);
 
-    if (strcasecmp(name, "href") == 0) {
+    if ((*name == 'h' || *name == 'H') && strcasecmp(name, "href") == 0) {
       chtml30->out = apr_pstrcat(r->pool, 
                       chtml30->out, 
                       " href=\"", 

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index 86ed4b7..5d1d244 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -262,7 +262,7 @@ chxj_load_cookie(request_rec* r, char* cookie_id)
 
 
   file = chxj_cookie_db_lock(r);
-  if (file == NULL) {
+  if (! file) {
     ERR(r, "mod_chxj: Can't lock cookie db");
     goto on_error0;
   }

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 63f1fd5..28e3cf4 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -511,7 +511,7 @@ s_hdml_search_emoji(hdml_t* hdml, char* txt, char** rslt)
     unsigned char hex1byte;
     unsigned char hex2byte;
 
-    if (!ee->imode) {
+    if (! ee->imode) {
       DBG(r, "emoji->imode is NULL");
       continue;
     }

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 93f1d40..7b46a6c 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -884,7 +884,7 @@ s_jhtml_start_body_tag(void* pdoc, Node* node)
                                " bgcolor=\"", 
                                value, 
                                "\"", 
-                      NULL);
+                               NULL);
     }
     else
     if ((*name == 't' || *name == 'T') && strcasecmp(name, "text") == 0) {