* change writting.

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

diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h
index 70257ab..d3e4846 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -123,8 +123,8 @@ chxj_qr_code_handler(request_rec* r);
 extern int     
 chxj_qrcode_create_image_data(
   qr_code_t* qrcode, 
-  char** img, 
-  size_t* img_len);
+  char**     img, 
+  size_t*    img_len);
 
 extern void    chxj_qrcode_node_to_qrcode      (qr_code_t* qrcode, Node* root);
 extern char*   chxj_qr_code_blob_handler       (request_rec* r, const char* indata, size_t* len);

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 8d13db2..3329a50 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -64,7 +64,7 @@ struct device_table_t {
   int                    available_jpeg;
   int                    available_png;
   int                    available_bmp2;
-  int available_bmp4;
+  int                    available_bmp4;
   /*--------------------------------------------------------------------------*/
   /* Resolution                                                               */
   /*--------------------------------------------------------------------------*/

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index 5c69803..70d90bf 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -41,7 +41,7 @@ extern char*    qs_trim_string(request_rec* r, char* s);
 
 extern int chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag);
 extern char* qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);
-char* qs_get_parse_attr(Doc* doc, Node* tag, request_rec* r);
+extern char* qs_get_parse_attr(Doc* doc, Node* tag, request_rec* r);
 #endif
 /*
  * vim:ts=2 et

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index efa1433..08a1d17 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -1249,8 +1249,12 @@ s_chtml30_start_font_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 (strcasecmp(name, "color") == 0) {
       chtml30->out = apr_pstrcat(r->pool, 

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index c5a6a32..e46ce30 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1516,7 +1516,7 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag)
   }
 
   s_output_to_hdml_card(hdml, 
-                  " MARKABLE=FALSE>\n"
+                        " MARKABLE=FALSE>\n"
                   "<ACTION TYPE=ACCEPT TASK=RETURN RETVALS=$V>\n"
                   "</ENTRY>\n");
 

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index c2c21bf..b8af658 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -179,7 +179,7 @@ static apr_status_t s_send_cache_file(  device_table*         spec,
 
 static apr_status_t s_header_only_cache_file(device_table* spec, 
                                              query_string_param_t* query_string, 
-  request_rec* r, 
+                                             request_rec* r, 
   const char* tmpfile);
 static query_string_param_t* s_get_query_string_param(request_rec *r);
 static unsigned short s_add_crc(        const char* writedata, 

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index fef2564..c053074 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1221,7 +1221,9 @@ s_jhtml_start_tr_tag(void* pdoc, Node* node)
 static char*
 s_jhtml_end_tr_tag(void* pdoc, Node* child) 
 {
-  jhtml_t* jhtml = GET_JHTML(pdoc);
+  jhtml_t* jhtml;
+
+  jhtml = GET_JHTML(pdoc);
 
   return jhtml->out;
 }

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index b6c5873..04b0544 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -35,7 +35,8 @@ static void s_set_devices_data(
 static void 
 s_set_user_agent_data(
   Doc* doc, 
-  apr_pool_t* p, mod_chxj_config* conf, Node* node) ;
+  apr_pool_t* p, 
+  mod_chxj_config* conf, Node* node) ;
 static void s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list* dtl, Node* node) ;
 /**
  * load device_data.xml

diff --git a/src/chxj_qr_code.c b/src/chxj_qr_code.c
index 39d32da..3228a96 100644 (file)
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -933,8 +933,7 @@ chxj_qr_code(qr_code_t* qrcode, char* module[])
   /*--------------------------------------------------------------------------*/
   min_lost_point = -1;
   min_mask_pattern = -1;
-  for (ii=0; ii<8; ii++)
-  {
+  for (ii=0; ii<8; ii++) {
     int lost_point;
     s_init_modules(qrcode, ii, module);
     s_map_data(qrcode,  module, (unsigned char*)eccstr, data_total_count, ii);