From f038cea3462cd95c952ac8dbd7ab2f0a5043f632 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Mon, 3 Jul 2006 16:46:35 +0000
Subject: [PATCH]   * change writting.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1627 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 include/chxj_apply_convrule.h   | 3 ++-
 include/chxj_calc_ecc.h         | 3 ++-
 include/chxj_chtml20.h          | 2 +-
 include/chxj_chtml30.h          | 2 +-
 include/chxj_cookie.h           | 3 ++-
 include/chxj_dump.h             | 3 ++-
 include/chxj_encoding.h         | 3 ++-
 include/chxj_hdml.h             | 3 ++-
 include/chxj_img_conv.h         | 3 ++-
 include/chxj_img_conv_format.h  | 3 ++-
 include/chxj_load_device_data.h | 3 ++-
 include/chxj_xhtml_mobile_1_0.h | 2 +-
 src/chxj_chtml30.c              | 8 ++++++--
 src/chxj_cookie.c               | 2 --
 src/chxj_encoding.c             | 2 +-
 src/chxj_hdml.c                 | 1 +
 src/chxj_jhtml.c                | 2 +-
 17 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/include/chxj_apply_convrule.h b/include/chxj_apply_convrule.h
index 22f14fb4..bc858d5d 100644
--- a/include/chxj_apply_convrule.h
+++ b/include/chxj_apply_convrule.h
@@ -21,7 +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 93f527c0..586a95b2 100644
--- a/include/chxj_calc_ecc.h
+++ b/include/chxj_calc_ecc.h
@@ -19,7 +19,8 @@
 #include "chxj_qr_code.h"
 
 extern int 
-chxj_calc_ecc(qr_code_t* qrcode,
+chxj_calc_ecc(
+  qr_code_t* qrcode,
               unsigned char* indata, 
               unsigned char* dst);
 #endif
diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 96af5513..02af4b7c 100644
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -44,7 +44,7 @@ struct ctml20_t {
 /*----------------------------------------------------------------------------*/
 extern char*
 chxj_exchange_chtml20(
-  request_rec* r,
+  request_rec*        r,
   device_table*       spec,
   const char*         src,
   apr_size_t          srclen,
diff --git a/include/chxj_chtml30.h b/include/chxj_chtml30.h
index 770fa2d0..26bd812d 100644
--- a/include/chxj_chtml30.h
+++ b/include/chxj_chtml30.h
@@ -44,7 +44,7 @@ struct chtml30_t {
 /*----------------------------------------------------------------------------*/
 extern char*
 chxj_exchange_chtml30(
-  request_rec*    r,
+  request_rec*        r,
   device_table*       spec,
   const char*         src,
   apr_size_t          srclen,
diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 93ddfa31..34b79b4e 100644
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -32,7 +32,8 @@ struct cookie_t {
   apr_array_header_t* cookie_headers;
 };
 
-extern cookie_t* chxj_save_cookie(request_rec *r);
+extern cookie_t* 
+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 4197b080..4672cd12 100644
--- a/include/chxj_dump.h
+++ b/include/chxj_dump.h
@@ -18,6 +18,7 @@
 #define __CHXJ_DUMP_H__
 
 extern void 
-chxj_dump_out(const char* title, const char* s, int slen);
+chxj_dump_out(
+  const char* title, const char* s, int slen);
 
 #endif
diff --git a/include/chxj_encoding.h b/include/chxj_encoding.h
index 55a1e6e0..318cd6dd 100644
--- a/include/chxj_encoding.h
+++ b/include/chxj_encoding.h
@@ -26,7 +26,8 @@
 /*----------------------------------------------------------------------------*/
 extern char* 
 chxj_encoding(
-  request_rec *r, const char* src, apr_size_t* len);
+  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 17d0d0b2..30af1f0b 100644
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -111,7 +111,8 @@ extern char* chxj_exchange_hdml(
   cookie_t*           cookie);
 
 extern char* 
-qs_out_apr_pstrcat(request_rec* r, char* o, char* s, int* len);
+qs_out_apr_pstrcat(
+  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_img_conv.h b/include/chxj_img_conv.h
index c9efb3dc..177be7ab 100644
--- a/include/chxj_img_conv.h
+++ b/include/chxj_img_conv.h
@@ -19,5 +19,6 @@
 #include "mod_chxj.h"
 
 extern char* 
-chxj_img_conv(request_rec* r, device_table* spec, const char* s);
+chxj_img_conv(
+  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 6bed40c6..79361601 100644
--- a/include/chxj_img_conv_format.h
+++ b/include/chxj_img_conv_format.h
@@ -22,7 +22,8 @@
 
 
 extern int 
-chxj_img_conv_format_handler(request_rec* r);
+chxj_img_conv_format_handler(
+  request_rec* r);
 char* 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 617d34c0..e7df507b 100644
--- a/include/chxj_load_device_data.h
+++ b/include/chxj_load_device_data.h
@@ -18,6 +18,7 @@
 #define __LOAD_DEVICE_DATA_H__
 #include "mod_chxj.h"
 
-extern void chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
+extern void 
+chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
 
 #endif
diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 89e8d440..33fec4bc 100644
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -27,7 +27,7 @@ struct xhtml_t {
     Doc*               doc;
     char*              out;
     int                out_len;
-    int                pre_flag;
+    int                 pre_flag;
     int                 textarea_flag;
 
     device_table*       spec;
diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 7ad7b7ba..9867f954 100644
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -792,8 +792,12 @@ s_chtml30_start_base_tag(void* pdoc, Node* node)
        attr;
        attr = qs_get_next_attr(doc,attr)) {
 
-    char* name = qs_get_attr_name(doc,attr);
-    char* value = qs_get_attr_value(doc,attr);
+    char* name;
+    char* value;
+
+    name = qs_get_attr_name(doc,attr);
+    value = qs_get_attr_value(doc,attr);
+
     if (strcasecmp(name, "href") == 0) {
       chtml30->out = apr_pstrcat(r->pool, 
                       chtml30->out, 
diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index 8ecfc2ae..86ed4b7b 100644
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -242,8 +242,6 @@ chxj_load_cookie(request_rec* r, char* cookie_id)
   char*                   val;
   char*                   pair;
 
-
-
   DBG1(r, "start chxj_load_cookie() cookie_id=[%s]", cookie_id);
 
   cookie = (cookie_t*)apr_palloc(r->pool, sizeof(cookie_t));
diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index 4a1491b4..5ce57aec 100644
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -41,7 +41,7 @@ chxj_encoding(request_rec *r, const char* src, apr_size_t* len)
   size_t result;
   apr_size_t ilen;
   apr_size_t olen;
-  mod_chxj_config* dconf;
+  mod_chxj_config*    dconf;
   chxjconvrule_entry* entryp;
 
   DBG(r,"start chxj_encoding()");
diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 2c1b1864..63f1fd53 100644
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -507,6 +507,7 @@ s_hdml_search_emoji(hdml_t* hdml, char* txt, char** rslt)
   for (ee = hdml->conf->emoji;
        ee;
        ee = ee->next) {
+
     unsigned char hex1byte;
     unsigned char hex2byte;
 
diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 62c4ef69..93f1d403 100644
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -883,7 +883,7 @@ s_jhtml_start_body_tag(void* pdoc, Node* node)
                                jhtml->out, 
                                " bgcolor=\"", 
                                value, 
-                      "\"", 
+                               "\"", 
                       NULL);
     }
     else
-- 
2.11.0