* change writting.

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

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 38dc6da..76fdf94 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -59,7 +59,7 @@ chxj_cookie_db_lock(
 extern void 
 chxj_cookie_db_unlock(
   request_rec* r, 
-  apr_file_t* file);
+  apr_file_t*  file);
 
 extern void chxj_delete_cookie(request_rec* r, char* cookie_id);
 

diff --git a/include/chxj_load_emoji_data.h b/include/chxj_load_emoji_data.h
index 6cdc762..615693a 100644 (file)
--- a/include/chxj_load_emoji_data.h
+++ b/include/chxj_load_emoji_data.h
@@ -24,6 +24,7 @@
 extern char* 
 chxj_load_emoji_data(
   Doc* doc, 
-  apr_pool_t *p, mod_chxj_config* conf);
+  apr_pool_t *p, 
+  mod_chxj_config* conf);
 
 #endif

diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h
index b88b2e3..33c4260 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -104,7 +104,7 @@ typedef enum _qr_mode_change_t {
 
 typedef struct qr_code_t qr_code_t;
 
-struct _qr_code_t {
+struct qr_code_t {
   qr_code_found_t  found;
   qr_mode_change_t mode_change;
 

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 30f7384..aea1f68 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -41,7 +41,7 @@ typedef struct device_table_t device_table;
 
 struct device_table_t {
   struct device_table_t* next;
-  const char* device_id;
+  const char*            device_id;
   const char* device_name;
   spec_type html_spec_type;
   int width;

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index 78107dc..07d3a1e 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -26,7 +26,7 @@ extern char*    qs_get_value_attr     (Doc* doc, Node* tag, request_rec* r);
 extern char*    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);
-char*    qs_get_istyle_attr    (Doc* doc, Node* tag, request_rec* r);
+extern char*    qs_get_istyle_attr    (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_maxlength_attr (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_size_attr      (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_accesskey_attr (Doc* doc, Node* tag, request_rec* r);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index be3e789..df967ef 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -991,7 +991,7 @@ s_chtml30_start_a_tag(void* pdoc, Node* node)
       chtml30->out = apr_pstrcat(r->pool, 
                                  chtml30->out, 
                                  " name=\"", 
-                      value, 
+                                 value, 
                       "\"", 
                       NULL);
     }

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index 90ba4e4..b7b1bc4 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -141,6 +141,7 @@ chxj_rencoding(request_rec *r, const char* src, apr_size_t* len)
     DBG(r,"end   chxj_rencoding()");
     return (char*)src;
   }
+
   memset(ibuf, 0, ilen+1);
   memcpy(ibuf, src, ilen);
 

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index c9d10d5..6e924c8 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1455,8 +1455,8 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag)
 
   hdml->card_cnt++;
   s_output_to_hdml_out(hdml, 
-                  apr_psprintf(r->pool,
-                          "<A TASK=GOSUB LABEL=\x93\xfc\x97\xcd DEST=#D%d "
+                       apr_psprintf(r->pool,
+                              "<A TASK=GOSUB LABEL=\x93\xfc\x97\xcd DEST=#D%d "
                           "VARS=\"V=$%s%02d\" RECEIVE=%s%02d>",
                           hdml->card_cnt,
                           s_get_form_no(r, hdml),

diff --git a/src/chxj_img_conv.c b/src/chxj_img_conv.c
index 94b6170..e146702 100644 (file)
--- a/src/chxj_img_conv.c
+++ b/src/chxj_img_conv.c
@@ -39,7 +39,7 @@ chxj_img_conv(
     default:       dst = apr_pstrcat(r->pool, dst,".30", NULL); break;
     }
 
-    if (spec->available_jpeg != 0)
+    if (spec->available_jpeg)
       return apr_pstrcat(r->pool, dst,".jpg", NULL);
 
     if (spec->available_png != 0)

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 787cc1f..5984a0f 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -168,8 +168,8 @@ static char*        s_create_workfile(  request_rec*,
 static apr_status_t s_create_cache_file(request_rec*  r, 
                                         const char*   tmpfile, 
                                         device_table* spec,
-                                        apr_finfo_t*  st,
-                                        query_string_param_t *qsp);
+                                        apr_finfo_t*          st,
+                                        query_string_param_t* qsp);
 static apr_status_t s_send_cache_file(  device_table* spec,
                                         query_string_param_t* query_string,
                                         request_rec* r,

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 66e2975..7d1e529 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1023,7 +1023,7 @@ s_jhtml_start_a_tag(void* pdoc, Node* node)
       /* CHTML1.0                                                             */
       /*----------------------------------------------------------------------*/
       jhtml->out = apr_pstrcat(r->pool, 
-                      jhtml->out, 
+                               jhtml->out, 
                       " accesskey=\"", 
                       value, 
                       "\"",