* change writting.

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

diff --git a/include/chxj_calc_ecc.h b/include/chxj_calc_ecc.h
index 66c834f..0aeaed4 100644 (file)
--- a/include/chxj_calc_ecc.h
+++ b/include/chxj_calc_ecc.h
@@ -20,7 +20,7 @@
 
 extern int 
 chxj_calc_ecc(
-  qr_code_t* qrcode,
+  qr_code_t*     qrcode,
   unsigned char* indata, 
   unsigned char* dst);
 #endif

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

diff --git a/include/chxj_dump.h b/include/chxj_dump.h
index 9e2f8d4..fe21f0f 100644 (file)
--- a/include/chxj_dump.h
+++ b/include/chxj_dump.h
@@ -21,6 +21,6 @@ extern void
 chxj_dump_out(
   const char* title, 
   const char* s, 
-  int slen);
+  int         slen);
 
 #endif

diff --git a/include/chxj_encoding.h b/include/chxj_encoding.h
index 1f6ebf9..1cd744b 100644 (file)
--- a/include/chxj_encoding.h
+++ b/include/chxj_encoding.h
@@ -26,9 +26,9 @@
 /*----------------------------------------------------------------------------*/
 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 29212c7..3f75b96 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -114,7 +114,8 @@ extern char*
 qs_out_apr_pstrcat(
   request_rec* r, 
   char* o, 
-  char* s, int* len);
+  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 68cb0f9..70457fa 100644 (file)
--- a/include/chxj_img_conv.h
+++ b/include/chxj_img_conv.h
@@ -21,5 +21,6 @@
 extern char* 
 chxj_img_conv(
   request_rec* r, 
-  device_table* spec, const char* s);
+  device_table* spec, 
+  const char* s);
 #endif

diff --git a/include/chxj_img_conv_format.h b/include/chxj_img_conv_format.h
index 2e31b4e..936cc59 100644 (file)
--- a/include/chxj_img_conv_format.h
+++ b/include/chxj_img_conv_format.h
@@ -24,7 +24,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);
+extern 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 97afe6b..6fe4795 100644 (file)
--- a/include/chxj_load_device_data.h
+++ b/include/chxj_load_device_data.h
@@ -20,6 +20,7 @@
 
 extern void 
 chxj_load_device_data(
-  Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
+  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 b8343f8..8eb54fa 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -103,7 +103,7 @@ typedef enum _qr_mode_change_t {
 } qr_mode_change_t;
 
 typedef struct _qr_code_t {
-  qr_code_found_t found;
+  qr_code_found_t  found;
   qr_mode_change_t mode_change;
 
   qr_ver_t     version;

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index fc19aa4..fc23e28 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -37,7 +37,9 @@ typedef enum {
 #include "chxj_cookie.h"
 
 
-typedef struct _device_table_t {
+typedef struct device_table_t device_table;
+
+struct device_table_t {
   struct _device_table_t* next;
   const char* device_id;
   const char* device_name;
@@ -80,9 +82,7 @@ typedef struct _device_table_t {
   /*--------------------------------------------------------------------------*/
   int color;
   char* emoji_type;
-
-
-} device_table;
+};
 
 typedef struct _device_table_list_t {
   struct _device_table_list_t* next;

diff --git a/include/chxj_str_util.h b/include/chxj_str_util.h
index 17e6201..92f9d68 100644 (file)
--- a/include/chxj_str_util.h
+++ b/include/chxj_str_util.h
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-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_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index afd3a08..efc5257 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -24,7 +24,7 @@
 /*----------------------------------------------------------------------------*/
 typedef struct xhtml_t xhtml_t;
 struct xhtml_t {
-    Doc*               doc;
+    Doc*                doc;
     char*               out;
     int                 out_len;
     int                 pre_flag;

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 14d39c9..a0c4fe6 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -801,7 +801,7 @@ s_chtml30_start_base_tag(void* pdoc, Node* node)
     if ((*name == 'h' || *name == 'H') && strcasecmp(name, "href") == 0) {
       chtml30->out = apr_pstrcat(r->pool, 
                                  chtml30->out, 
-                      " href=\"", 
+                                 " href=\"", 
                       value, 
                       "\"", 
                       NULL);

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index c4bf9e7..ae63bcd 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -413,6 +413,7 @@ s_get_hostname_from_url(request_rec* r, char* value)
   return NULL;
 }
 
+
 static char* 
 s_cut_until_end_hostname(request_rec* r, char* value)
 {

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

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 82a4d36..044b62a 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -966,6 +966,7 @@ s_hdml_start_a_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);
     if ((*name == 'n' || *name == 'N') && strcasecmp(name, "name") == 0) {

diff --git a/src/chxj_img_conv.c b/src/chxj_img_conv.c
index 087da38..0132235 100644 (file)
--- a/src/chxj_img_conv.c
+++ b/src/chxj_img_conv.c
@@ -18,7 +18,8 @@
 
 
 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)
 {
   char* dst;
 

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 4f123e4..7abc79a 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -56,7 +56,9 @@ typedef enum _ua_use_flag_t {
 /*----------------------------------------------------------------------------*/
 /* Request parameter maintenance structure                                    */
 /*----------------------------------------------------------------------------*/
-typedef struct _query_string_param_t {
+typedef struct query_string_param_t query_string_param_t;
+
+struct query_string_param_t {
   img_conv_mode_t   mode;
   char*             user_agent;
   ua_use_flag_t     ua_flag;
@@ -66,7 +68,7 @@ typedef struct _query_string_param_t {
   long              count;     /* for EZGET */
   int               width;
   int               height;
-} query_string_param_t;
+};
 
 /*----------------------------------------------------------------------------*/
 /* Device_spec when User-Agent is disregarded                                 */

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 2ec1e10..5acc701 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -893,7 +893,7 @@ s_jhtml_start_body_tag(void* pdoc, Node* node)
       /*----------------------------------------------------------------------*/
       jhtml->out = apr_pstrcat(r->pool, 
                                jhtml->out, 
-                      " text=\"", 
+                               " text=\"", 
                       value, 
                       "\"", 
                       NULL);