* change writting.

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

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index f2925f1..a450b14 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -29,9 +29,10 @@ qs_get_value_attr(
   request_rec* r);
 
 extern char*    
-qs_get_checked_attr   (
-  Doc* doc, 
-  Node* tag, request_rec* r);
+qs_get_checked_attr(
+  Doc*         doc, 
+  Node*        tag, 
+  request_rec* r);
 
 extern char*    qs_get_type_attr      (Doc* doc, Node* tag, request_rec* r);
 extern char*    qs_get_name_attr      (Doc* doc, Node* tag, request_rec* r);

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 7a9e738..88fbc87 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -200,10 +200,12 @@ struct _chxjconvrule_entry {
   char       *user_agent;
 };
 
-typedef struct {
+typedef struct tag_handler tag_handler;
+
+struct tag_handler {
   char* (*start_tag_handler)(void* doc, Node* node); 
   char* (*end_tag_handler)(void* doc, Node* node); 
-} tag_handler;
+};
 
 #include "chxj_specified_device.h"
 

diff --git a/include/qs_ignore_sp.h b/include/qs_ignore_sp.h
index 0d7df5f..6dd477a 100644 (file)
--- a/include/qs_ignore_sp.h
+++ b/include/qs_ignore_sp.h
@@ -24,6 +24,8 @@ qs_ignore_sp(
   const char*, int);
 
 extern int 
-qs_ignore_sp_and_quote(Doc* doc, const char* s, int len) ;
+qs_ignore_sp_and_quote(
+  Doc* doc, 
+  const char* s, int len) ;
 
 #endif

diff --git a/include/qs_log.h b/include/qs_log.h
index e7bd14a..ee05074 100644 (file)
--- a/include/qs_log.h
+++ b/include/qs_log.h
@@ -36,5 +36,6 @@
 extern void 
 qs_log(Doc* doc, int log_level,const char* f, int l, char* msg);
 
-extern void qs_log_int(Doc* doc, int log_level,const char* f, int l, char* msg, int val);
+extern void 
+qs_log_int(Doc* doc, int log_level,const char* f, int l, char* msg, int val);
 #endif

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 552bcb8..b07ddf7 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -1362,7 +1362,7 @@ s_chtml30_start_form_tag(void* pdoc, Node* node)
                                  " method=\"",
                                  value,
                                  "\"", 
-                      NULL);
+                                 NULL);
     }
     else
     if (strcasecmp(name, "utn") == 0) {

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 958ea0d..b69e734 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1572,7 +1572,7 @@ s_hdml_do_input_password_tag(hdml_t* hdml, Node* tag)
 
   s_output_to_hdml_out(hdml, 
                   apr_psprintf(r->pool, "RECEIVE=%s%02d>"  , 
-                          s_get_form_no(r, hdml),
+                               s_get_form_no(r, hdml),
                           hdml->var_cnt[hdml->pure_form_cnt]));
   s_output_to_hdml_out(hdml, 
                   apr_psprintf(r->pool, "[$%s%02d]</A>\n"  , 

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 19ed1c9..7d7ebe2 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -207,7 +207,7 @@ static MagickWand* s_add_copyright(
 
 static char* s_create_blob_data(request_rec* r,
                                 device_table* spec,
-                   query_string_param_t *qsp,
+                                query_string_param_t *qsp,
                    char* indata,
                    apr_size_t* len);
 

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 5fd5256..1525397 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1362,8 +1362,8 @@ s_jhtml_start_form_tag(void* pdoc, Node* node)
       /* CHTML 1.0                                                            */
       /*----------------------------------------------------------------------*/
       jhtml->out = apr_pstrcat(r->pool, 
-                      jhtml->out, 
-                      " method=\"",
+                               jhtml->out, 
+                               " method=\"",
                       value,
                       "\"", 
                       NULL);

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index 7e14f90..0c54523 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -43,6 +43,7 @@ static void
 s_set_device_data(
   Doc* doc, apr_pool_t* p, device_table_list* dtl, Node* node) ;
 
+
 /**
  * load device_data.xml
  */
@@ -51,9 +52,9 @@ chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf)
 {
   conf->devices = NULL;
   s_set_devices_data(doc, p, conf,qs_get_root(doc));
-
 }
 
+
 /**
  * <devices>
  */

diff --git a/src/chxj_qr_code.c b/src/chxj_qr_code.c
index 34e54a6..e359b89 100644 (file)
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -996,9 +996,12 @@ chxj_qr_code(qr_code_t* qrcode, char* module[])
 void
 chxj_qrcode_node_to_qrcode(qr_code_t* qrcode, Node* node)
 {
-  request_rec* r = qrcode->r;
-  Doc* doc = qrcode->doc;
-  Node* child;
+  request_rec* r;
+  Doc*         doc;
+  Node*        child;
+
+  r   = qrcode->r;
+  doc = qrcode->doc;
 
   for (child = qs_get_child_node(doc,node);
        child ;