* change writting.

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

diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h
index 81f2da5..4bcb164 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -121,7 +121,8 @@ extern int
 chxj_qr_code_handler(request_rec* r);
 
 extern int     
-chxj_qrcode_create_image_data   (qr_code_t* qrcode, char** img, size_t* img_len);
+chxj_qrcode_create_image_data(
+  qr_code_t* qrcode, 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 7a6d62b..f93cab3 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -61,7 +61,7 @@ struct device_table_t {
   /* 0: It is not possible to display it.                                     */
   /*--------------------------------------------------------------------------*/
   int                    available_gif;
-  int available_jpeg;
+  int                    available_jpeg;
   int available_png;
   int available_bmp2;
   int available_bmp4;

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index fc7d95a..905b891 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -37,7 +37,7 @@ extern char*    qs_get_selected_value_text(Doc *doc, Node* node, request_rec* r)
 extern char*    qs_get_selected_value(Doc* doc, Node* node, request_rec* r);
 
 extern char*    qs_alloc_zero_byte_string(request_rec* r);
-char*    qs_trim_string(request_rec* r, char* s);
+extern char*    qs_trim_string(request_rec* r, char* s);
 
 int chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag);
 char* qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);

diff --git a/include/chxj_url_encode.h b/include/chxj_url_encode.h
index 5a975d8..4aca725 100644 (file)
--- a/include/chxj_url_encode.h
+++ b/include/chxj_url_encode.h
@@ -27,7 +27,7 @@ chxj_url_encode(
 extern char* 
 chxj_url_decode(
   request_rec* r, 
-  const char* src);
+  const char*  src);
 
 #endif
 /*

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index a026053..1b88317 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -178,13 +178,15 @@ struct jphone_emoji_t {
   char* string;
 } jphone_emoji_t;
 
-typedef struct _emoji_t {
+typedef struct emoji_t emoji_t;
+
+struct emoji_t {
   struct _emoji_t* next;
   int no;
   imode_emoji_t* imode;
   ezweb_emoji_t* ezweb;
   jphone_emoji_t* jphone;
-} emoji_t;
+};
 
 typedef struct _chxjconvrule_entry {
   char       *pattern;

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index e72e854..e1d5f87 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -1047,7 +1047,7 @@ s_chtml30_start_a_tag(void* pdoc, Node* node)
       /* It is special only for CHTML.                                        */
       /*----------------------------------------------------------------------*/
       chtml30->out = apr_pstrcat(r->pool, 
-                      chtml30->out, 
+                                 chtml30->out, 
                       " utn ", 
                       NULL);
     }

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index d39a26d..ab05e89 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -201,6 +201,7 @@ chxj_encoding_parameter(request_rec* r, const char* value)
     return src;
   }
   *spos++ = 0;
+
   src_sv = apr_pstrdup(r->pool, src);
   param = apr_palloc(r->pool, 1);
   param[0] = 0;

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 5467588..aa87008 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1489,7 +1489,7 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag)
 
   s_output_to_postdata(hdml, 
                        apr_psprintf(r->pool, 
-                          "%s=$%s%02d", 
+                                    "%s=$%s%02d", 
                           nm,
                           s_get_form_no(r, hdml),
                           hdml->var_cnt[hdml->pure_form_cnt]));

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 8276699..38297c6 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -175,7 +175,7 @@ static apr_status_t s_create_cache_file(request_rec*          r,
 static apr_status_t s_send_cache_file(  device_table*         spec,
                                         query_string_param_t* query_string,
                                         request_rec*          r,
-                                        const char* tmpfile);
+                                        const char*           tmpfile);
 
 static apr_status_t s_header_only_cache_file(
   device_table* spec, 

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 6c2e0d3..d1c83ca 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1127,9 +1127,13 @@ s_jhtml_start_a_tag(void* pdoc, Node* node)
 static char*
 s_jhtml_end_a_tag(void* pdoc, Node* child) 
 {
-  jhtml_t*     jhtml = GET_JHTML(pdoc);
-  Doc*         doc   = jhtml->doc;
-  request_rec* r     = doc->r;
+  jhtml_t*     jhtml;
+  Doc*         doc;
+  request_rec* r;
+
+  jhtml = GET_JHTML(pdoc);
+  doc   = jhtml->doc;
+  r     = doc->r;
 
   jhtml->out = apr_pstrcat(r->pool, jhtml->out, "</a>", NULL);
 

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index 385de85..57888f4 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -32,7 +32,8 @@ static void s_set_devices_data(
   mod_chxj_config* conf, 
   Node*            node) ;
 
-static void s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) ;
+static void 
+s_set_user_agent_data(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 a47d4e0..5236241 100644 (file)
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -759,7 +759,8 @@ chxj_qrcode_create_image_data(
   else {  
     status = MagickResizeImage(magick_wand, 
                                (module_count * qrcode->size + 6), 
-                               (module_count * qrcode->size + 6) , LanczosFilter,0.0);
+                               (module_count * qrcode->size + 6) , 
+                               LanczosFilter,0.0);
   }
   if (status == MagickFalse) 
     goto on_error;