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

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1623 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 include/chxj_chtml10.h          | 2 +-
 include/chxj_chtml20.h          | 2 +-
 include/chxj_chtml30.h          | 2 +-
 include/chxj_hdml.h             | 1 +
 include/chxj_xhtml_mobile_1_0.h | 5 +++--
 src/chxj_chtml30.c              | 2 +-
 src/chxj_cookie.c               | 2 +-
 src/chxj_hdml.c                 | 1 +
 src/chxj_jhtml.c                | 8 ++++++--
 9 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/chxj_chtml10.h b/include/chxj_chtml10.h
index 5eb174f4..217ad676 100644
--- a/include/chxj_chtml10.h
+++ b/include/chxj_chtml10.h
@@ -50,5 +50,5 @@ chxj_exchange_chtml10(
   apr_size_t          srclen, 
   apr_size_t*         dstlen, 
   chxjconvrule_entry* entryp, 
-  cookie_t*);
+  cookie_t*           cookie);
 #endif
diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 4854d69e..f74b3fed 100644
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -48,7 +48,7 @@ chxj_exchange_chtml20(
   device_table* spec,
   const char* src,
   apr_size_t srclen,
-  apr_size_t *dstlen,
+  apr_size_t*         dstlen,
   chxjconvrule_entry* entryp,
   cookie_t* cookie);
 #endif
diff --git a/include/chxj_chtml30.h b/include/chxj_chtml30.h
index 68e54b67..a1d07a3d 100644
--- a/include/chxj_chtml30.h
+++ b/include/chxj_chtml30.h
@@ -48,7 +48,7 @@ chxj_exchange_chtml30(
   device_table*   spec,
   const char*     src,
   apr_size_t      srclen,
-  apr_size_t*     dstlen,
+  apr_size_t*         dstlen,
   chxjconvrule_entry* entryp,
   cookie_t*           cookie);
 #endif
diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 021cc0c1..0d1da7ff 100644
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -109,6 +109,7 @@ extern char* chxj_exchange_hdml(
   apr_size_t*         dstlen,
   chxjconvrule_entry* entryp,
   cookie_t*           cookie);
+
 char* qs_out_apr_pstrcat(request_rec* r, char* o, char* s, int* len);
 char* qs_conv_istyle_to_format(request_rec* r, char* is);
 
diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 1a7f99c3..0ae62d85 100644
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -22,7 +22,8 @@
 /*----------------------------------------------------------------------------*/
 /* Structure for HDML                                                         */
 /*----------------------------------------------------------------------------*/
-typedef struct _xhtml_t {
+typedef struct xhtml_t xhtml_t;
+struct xhtml_t {
     Doc*               doc;
     char*              out;
     int                out_len;
@@ -33,7 +34,7 @@ typedef struct _xhtml_t {
     mod_chxj_config*   conf;
     chxjconvrule_entry* entryp;
     cookie_t*           cookie;
-} xhtml_t;
+};
 
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 935fd19c..f530683f 100644
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -631,7 +631,7 @@ s_chtml30_start_meta_tag(void* pdoc, Node* node)
                                    " ",
                                    name,
                                    "=\"",
-                        value,
+                                   value,
                         "\"",
                         NULL);
       }
diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index 24b7fb3d..b3c40ae5 100644
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -237,7 +237,7 @@ chxj_load_cookie(request_rec* r, char* cookie_id)
   cookie_t*               cookie;
   apr_table_t*            load_cookie_table;
   char*                   load_string;
-  char*               pstat;
+  char*                   pstat;
   char*               key;
   char*               val;
   char*               pair;
diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 07fbe4f7..623388fd 100644
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -487,6 +487,7 @@ s_init_hdml(hdml_t* hdml, Doc* doc, request_rec* r, device_table* spec)
   hdml->out = qs_alloc_zero_byte_string(r);
 }
 
+
 static int
 s_hdml_search_emoji(hdml_t* hdml, char* txt, char** rslt)
 {
diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 4008e597..b31bfbfd 100644
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -868,8 +868,12 @@ s_jhtml_start_body_tag(void* pdoc, Node* node)
   for (attr = qs_get_attr(doc,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 ((*name == 'b' || *name == 'B') && strcasecmp(name, "bgcolor") == 0) {
       /*----------------------------------------------------------------------*/
-- 
2.11.0