* change writting.

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

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 2dfc166..02c934a 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -56,7 +56,8 @@ extern apr_file_t*
 chxj_cookie_db_lock(
   request_rec* r);
 
-extern void chxj_cookie_db_unlock(request_rec* r, apr_file_t* file);
+extern void 
+chxj_cookie_db_unlock(request_rec* r, apr_file_t* file);
 extern void chxj_delete_cookie(request_rec* r, char* cookie_id);
 
 #endif

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

diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h
index 5a34d1e..b88b2e3 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -102,7 +102,9 @@ typedef enum _qr_mode_change_t {
   QR_CHANGE,
 } qr_mode_change_t;
 
-typedef struct _qr_code_t {
+typedef struct qr_code_t qr_code_t;
+
+struct _qr_code_t {
   qr_code_found_t  found;
   qr_mode_change_t mode_change;
 
@@ -113,7 +115,7 @@ typedef struct _qr_code_t {
   Doc*             doc;
   int              size;
   char*            indata;
-} qr_code_t;
+};
 
 int     chxj_qr_code_handler            (request_rec* r);
 int     chxj_qrcode_create_image_data   (qr_code_t* qrcode, char** img, size_t* img_len);

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

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index eb90298..78107dc 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -25,7 +25,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);
-char*    qs_get_name_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);
 char*    qs_get_maxlength_attr (Doc* doc, Node* tag, request_rec* r);
 char*    qs_get_size_attr      (Doc* doc, Node* tag, request_rec* r);

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index f55dc3d..fd33b46 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -977,6 +977,7 @@ s_chtml30_start_a_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);
 

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index b829a63..fb4e008 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -118,8 +118,7 @@ chxj_rencoding(request_rec *r, const char* src, apr_size_t* len)
   DBG(r,"start chxj_rencoding()");
 
   dconf = ap_get_module_config(r->per_dir_config, &chxj_module);
-
-  if (dconf == NULL) {
+  if (! dconf) {
     DBG(r,"none encoding.");
     return (char*)src;
   }

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 5164a91..0fbca63 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1343,6 +1343,7 @@ s_hdml_start_input_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);
 

diff --git a/src/chxj_img_conv.c b/src/chxj_img_conv.c
index af0d49a..94b6170 100644 (file)
--- a/src/chxj_img_conv.c
+++ b/src/chxj_img_conv.c
@@ -19,7 +19,7 @@
 
 char* 
 chxj_img_conv(
-  request_rec* r, 
+  request_rec*  r, 
   device_table* spec, 
   const char*   s)
 {

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 18253cd..787cc1f 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -168,7 +168,7 @@ 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,
+                                        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,

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index c42785b..599c6a4 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1012,7 +1012,7 @@ s_jhtml_start_a_tag(void* pdoc, Node* node)
       value = chxj_add_cookie_parameter(r, value, jhtml->cookie);
       jhtml->out = apr_pstrcat(r->pool, 
                                jhtml->out, 
-                      " href=\"", 
+                               " href=\"", 
                       value, 
                       "\"", 
                       NULL);