* change writting.

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

diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h
index 33b030c..70257ab 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -123,7 +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 2855a67..8d13db2 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -63,7 +63,7 @@ struct device_table_t {
   int                    available_gif;
   int                    available_jpeg;
   int                    available_png;
-  int available_bmp2;
+  int                    available_bmp2;
   int available_bmp4;
   /*--------------------------------------------------------------------------*/
   /* Resolution                                                               */

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index dba60a2..5c69803 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -40,7 +40,7 @@ extern char*    qs_alloc_zero_byte_string(request_rec* r);
 extern char*    qs_trim_string(request_rec* r, char* s);
 
 extern int chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag);
-char* qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);
+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);
 #endif
 /*

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 754e8e4..9fb53c3 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -183,7 +183,7 @@ typedef struct emoji_t emoji_t;
 struct emoji_t {
   struct _emoji_t* next;
   int no;
-  imode_emoji_t* imode;
+  imode_emoji_t*  imode;
   ezweb_emoji_t*  ezweb;
   jphone_emoji_t* jphone;
 };

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index 3802e8a..bc28e9a 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -1049,7 +1049,7 @@ s_chtml30_start_a_tag(void* pdoc, Node* node)
       chtml30->out = apr_pstrcat(r->pool, 
                                  chtml30->out, 
                                  " utn ", 
-                      NULL);
+                                 NULL);
     }
     else
     if (strcasecmp(name, "telbook") == 0) {

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index d3d3afb..fc83e21 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -252,6 +252,7 @@ chxj_encoding_parameter(request_rec* r, const char* value)
     }
   }
   DBG(r, "end   chxj_encoding_parameter()");
+
   return apr_pstrcat(r->pool, src_sv, "?", param, NULL);
 }
 /*

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index b1253e2..92d11b6 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1491,7 +1491,7 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag)
                        apr_psprintf(r->pool, 
                                     "%s=$%s%02d", 
                                     nm,
-                          s_get_form_no(r, hdml),
+                                    s_get_form_no(r, hdml),
                           hdml->var_cnt[hdml->pure_form_cnt]));
 
   mlen = qs_get_maxlength_attr  (doc, tag, r);

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

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 9e29981..6e2ef78 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1177,7 +1177,9 @@ s_jhtml_start_br_tag(void* pdoc, Node* node)
 static char*
 s_jhtml_end_br_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 11959c3..b6c5873 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -34,7 +34,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) ;
+  Doc* doc, 
+  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 5fa8b3b..39d32da 100644 (file)
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -847,15 +847,19 @@ chxj_qr_code(qr_code_t* qrcode, char* module[])
     case QR_NUM_MODE:
       real_data = s_data_to_bin_num(qrcode, data_code_count);
       break;
+
     case QR_ALPHA_MODE:
       real_data = s_data_to_bin_alpha(qrcode, data_code_count);
       break;
+
     case QR_8BIT_MODE:
       real_data = s_data_to_bin_8bit(qrcode,data_code_count);
       break;
+
     case QR_KANJI_MODE:
       real_data = s_data_to_bin_kanji(qrcode,data_code_count);
       break;
+
     default:
       qrcode->mode = QR_8BIT_MODE;
       qrcode->mode_change = QR_CHANGE;