*** empty log message ***

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

diff --git a/include/chxj_calc_ecc.h b/include/chxj_calc_ecc.h
index d7b85ac..f99e202 100644 (file)
--- a/include/chxj_calc_ecc.h
+++ b/include/chxj_calc_ecc.h
@@ -16,12 +16,13 @@
  */
 #ifndef __CHXJ_CALC_ECC_H__
 #define __CHXJ_CALC_ECC_H__
+
 #include "chxj_qr_code.h"
 
 extern int chxj_calc_ecc(
-  qr_code_t*     qrcode,
-  unsigned char* indata, 
-  unsigned char* dst);
+  qr_code_t*              qrcode,
+  unsigned char*          indata, 
+  unsigned char*          dst);
 
 #endif
 /*

diff --git a/include/chxj_chtml10.h b/include/chxj_chtml10.h
index 002bddf..0c3198b 100644 (file)
--- a/include/chxj_chtml10.h
+++ b/include/chxj_chtml10.h
@@ -18,6 +18,7 @@
 #define __CHXJ_CHTM_1_0_H__
 
 /*#define DUMP_CHTML10 "" */
+
 #include "mod_chxj.h"
 #include "chxj_cookie.h"
 
@@ -43,12 +44,12 @@ struct ctml10_t {
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
 extern char* chxj_exchange_chtml10(
-  request_rec*        r,
-  device_table*       spec, 
-  const char*         src, 
-  apr_size_t          srclen, 
-  apr_size_t*         dstlen, 
-  chxjconvrule_entry* entryp, 
-  cookie_t*           cookie);
+  request_rec*          r,
+  device_table*         spec, 
+  const char*           src, 
+  apr_size_t            srclen, 
+  apr_size_t*           dstlen, 
+  chxjconvrule_entry*   entryp, 
+  cookie_t*             cookie);
 
 #endif

diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 8e3c1b6..aee8ce7 100644 (file)
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -18,6 +18,7 @@
 #define __CHXJ_CHTM20_H__
 
 /*#define DUMP_CHTML20 ""*/
+
 #include "mod_chxj.h"
 #include "chxj_cookie.h"
 
@@ -43,12 +44,12 @@ struct ctml20_t {
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
 extern char* chxj_exchange_chtml20(
-  request_rec*        r,
-  device_table*       spec,
-  const char*         src,
-  apr_size_t          srclen,
-  apr_size_t*         dstlen,
-  chxjconvrule_entry* entryp,
-  cookie_t*           cookie);
+  request_rec*          r,
+  device_table*         spec,
+  const char*           src,
+  apr_size_t            srclen,
+  apr_size_t*           dstlen,
+  chxjconvrule_entry*   entryp,
+  cookie_t*             cookie);
 
 #endif

diff --git a/include/chxj_chtml30.h b/include/chxj_chtml30.h
index 1638d8a..ea4ff3d 100644 (file)
--- a/include/chxj_chtml30.h
+++ b/include/chxj_chtml30.h
@@ -43,12 +43,12 @@ struct chtml30_t {
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
 extern char* chxj_exchange_chtml30(
-  request_rec*        r,
-  device_table*       spec,
-  const char*         src,
-  apr_size_t          srclen,
-  apr_size_t*         dstlen,
-  chxjconvrule_entry* entryp,
-  cookie_t*           cookie);
+  request_rec*          r,
+  device_table*         spec,
+  const char*           src,
+  apr_size_t            srclen,
+  apr_size_t*           dstlen,
+  chxjconvrule_entry*   entryp,
+  cookie_t*             cookie);
 
 #endif

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index 269c57d..106656b 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -36,7 +36,8 @@
 /* 
  * default cookie timeout is 30 minute
  */
-#define DEFAULT_COOKIE_TIMEOUT (1800)
+#define DEFAULT_COOKIE_TIMEOUT          (1800)
+
 
 typedef struct cookie_t cookie_t;
 
@@ -48,31 +49,31 @@ struct cookie_t {
 
 
 extern cookie_t* chxj_save_cookie(
-  request_rec *r);
+  request_rec*            r);
 
-extern char*     chxj_add_cookie_parameter(
-  request_rec* r, 
-  char*        value, 
-  cookie_t*    cookie);
+extern char* chxj_add_cookie_parameter(
+  request_rec*            r, 
+  char*                   value, 
+  cookie_t*               cookie);
 
 extern int chxj_cookie_check_host(
-  request_rec* r, 
-  char*        value);
+  request_rec*            r, 
+  char*                   value);
 
 extern cookie_t* chxj_load_cookie(
-  request_rec* r, 
-  char*        cookie_id);
+  request_rec*            r, 
+  char*                   cookie_id);
 
 extern apr_file_t* chxj_cookie_db_lock(
-  request_rec* r);
+  request_rec*            r);
 
 extern void chxj_cookie_db_unlock(
-  request_rec* r, 
-  apr_file_t*  file);
+  request_rec*            r, 
+  apr_file_t*             file);
 
 extern void chxj_delete_cookie(
-  request_rec* r, 
-  char*        cookie_id);
+  request_rec*            r, 
+  char*                   cookie_id);
 
 extern char* chxj_cookie_db_name_create(
   request_rec* r, 

diff --git a/include/chxj_dump.h b/include/chxj_dump.h
index b1ae975..27a832b 100644 (file)
--- a/include/chxj_dump.h
+++ b/include/chxj_dump.h
@@ -18,8 +18,8 @@
 #define __CHXJ_DUMP_H__
 
 extern void chxj_dump_out(
-  const char* title, 
-  const char* s, 
-  int         slen);
+  const char*       title, 
+  const char*       s, 
+  int               slen);
 
 #endif

diff --git a/include/chxj_encoding.h b/include/chxj_encoding.h
index d711a73..8598aed 100644 (file)
--- a/include/chxj_encoding.h
+++ b/include/chxj_encoding.h
@@ -25,18 +25,18 @@
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
 extern char* chxj_encoding(
-  request_rec* r, 
-  const char*  src, 
-  apr_size_t*  len);
+  request_rec*     r, 
+  const char*      src, 
+  apr_size_t*      len);
 
 extern char* chxj_rencoding(
-  request_rec* r, 
-  const char*  src, 
-  apr_size_t*  len);
+  request_rec*     r, 
+  const char*      src, 
+  apr_size_t*      len);
 
 extern char* chxj_encoding_parameter(
-  request_rec* r, 
-  const char*  value);
+  request_rec*     r, 
+  const char*      value);
 
 #endif
 

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 0ce7894..8e38e0c 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -35,18 +35,18 @@
 typedef struct hdml_t hdml_t;
 
 struct hdml_t {
-  Doc*    doc;
-  char*   out;
-  int     center;
-  int     in_center;
-  char*   card;
-  int     card_cnt;
-  apr_time_t   form_cnt;
+  Doc*           doc;
+  char*          out;
+  int            center;
+  int            in_center;
+  char*          card;
+  int            card_cnt;
+  apr_time_t     form_cnt;
 
   /*--------------------------------------------------------------------------*/
   /* If the title tag is found, it becomes ``1''.                             */
   /*--------------------------------------------------------------------------*/
-  int     found_title;
+  int            found_title;
   /*--------------------------------------------------------------------------*/
   /* Counter of pure form tag                                                 */
   /*--------------------------------------------------------------------------*/
@@ -87,7 +87,7 @@ struct hdml_t {
   int     hdml_a_flag;
   int     hdml_br_flag;
 
-  int     hdml_end_flag;
+  int                 hdml_end_flag;
 
   device_table*       spec;
 

diff --git a/include/chxj_img_conv.h b/include/chxj_img_conv.h
index f14f78d..034a32b 100644 (file)
--- a/include/chxj_img_conv.h
+++ b/include/chxj_img_conv.h
@@ -20,8 +20,8 @@
 #include "mod_chxj.h"
 
 extern char* chxj_img_conv(
-  request_rec*  r, 
-  device_table* spec, 
-  const char*   s);
+  request_rec*       r, 
+  device_table*      spec, 
+  const char*        s);
 
 #endif

diff --git a/include/chxj_img_conv_format.h b/include/chxj_img_conv_format.h
index c2bfe27..7ef6d79 100644 (file)
--- a/include/chxj_img_conv_format.h
+++ b/include/chxj_img_conv_format.h
@@ -22,15 +22,15 @@
 
 
 extern int chxj_img_conv_format_handler(
-  request_rec* r);
+  request_rec*       r);
 
 extern char* chxj_exchange_image(
-  request_rec* r, 
-  const char** src, 
-  apr_size_t*  len);
+  request_rec*       r, 
+  const char**       src, 
+  apr_size_t*        len);
 
 extern int chxj_trans_name(
-  request_rec *r);
+  request_rec*       r);
 
 
 #endif

diff --git a/include/chxj_jhtml.h b/include/chxj_jhtml.h
index 2fbec65..d3425ed 100644 (file)
--- a/include/chxj_jhtml.h
+++ b/include/chxj_jhtml.h
@@ -18,6 +18,7 @@
 #define __CHXJ_JHTML_H__
 
 /* #define DUMP_JHTML "" */
+
 #include "mod_chxj.h"
 #include "chxj_cookie.h"
 
@@ -43,12 +44,12 @@ struct jhtml_t {
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
 extern char* chxj_exchange_jhtml(
-  request_rec*        r,
-  device_table*       spec,
-  const char*         src,
-  apr_size_t          srclen,
-  apr_size_t*         dstlen,
-  chxjconvrule_entry* entryp,
-  cookie_t*           cookie);
+  request_rec*              r,
+  device_table*             spec,
+  const char*               src,
+  apr_size_t                srclen,
+  apr_size_t*               dstlen,
+  chxjconvrule_entry*       entryp,
+  cookie_t*                 cookie);
 
 #endif

diff --git a/include/chxj_load_device_data.h b/include/chxj_load_device_data.h
index 61e5603..ecb8976 100644 (file)
--- a/include/chxj_load_device_data.h
+++ b/include/chxj_load_device_data.h
@@ -20,8 +20,8 @@
 #include "mod_chxj.h"
 
 extern void chxj_load_device_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_load_emoji_data.h b/include/chxj_load_emoji_data.h
index 808e629..9840bd1 100644 (file)
--- a/include/chxj_load_emoji_data.h
+++ b/include/chxj_load_emoji_data.h
@@ -22,8 +22,8 @@
 
 
 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 f2fa057..628bd15 100644 (file)
--- a/include/chxj_qr_code.h
+++ b/include/chxj_qr_code.h
@@ -117,21 +117,21 @@ struct qr_code_t {
   char*            indata;
 };
 
-extern int     chxj_qr_code_handler(
-  request_rec* r);
+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);
+extern int 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);
+  qr_code_t*         qrcode, 
+  Node*              root);
 
 extern char*   chxj_qr_code_blob_handler(
-  request_rec* r, 
-  const char*  indata, 
-  size_t*      len);
+  request_rec*       r, 
+  const char*        indata, 
+  size_t*            len);
 
 #endif

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 9de6ffc..dbdd7c3 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -89,10 +89,10 @@ typedef struct device_table_list_t  device_table_list;
 struct device_table_list_t {
   struct device_table_list_t* next;
 
-  char*         pattern;
-  ap_regex_t*   regexp;
-  device_table* table;
-  device_table* tail;
+  char*                       pattern;
+  ap_regex_t*                 regexp;
+  device_table*               table;
+  device_table*               tail;
 };
 
 typedef struct converter_t converter_t;
@@ -115,7 +115,7 @@ struct converter_t {
 extern converter_t convert_routine[];
 
 extern device_table* chxj_specified_device(
-  request_rec* r, 
-  const char*  user_agent);
+  request_rec*          r, 
+  const char*           user_agent);
 
 #endif

diff --git a/include/chxj_str_util.h b/include/chxj_str_util.h
index ecfed53..9733040 100644 (file)
--- a/include/chxj_str_util.h
+++ b/include/chxj_str_util.h
@@ -20,10 +20,10 @@
 #include <string.h>
 
 extern int chxj_chk_numeric(
-  const char* s);
+  const char*          s);
 
 extern int chxj_atoi(
-  const char* s);
+  const char*          s);
 
 #endif
 /*

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index d63ecb2..9153b22 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -23,14 +23,14 @@
 /* prototype declare                                                          */
 /*----------------------------------------------------------------------------*/
 extern char* qs_get_value_attr(
-  Doc*         doc, 
-  Node*        tag, 
-  request_rec* r);
+  Doc*                doc, 
+  Node*               tag, 
+  request_rec*        r);
 
 extern char* qs_get_checked_attr(
-  Doc*         doc, 
-  Node*        tag, 
-  request_rec* r);
+  Doc*                doc, 
+  Node*               tag, 
+  request_rec*        r);
 
 extern char* qs_get_type_attr(
   Doc*         doc,

diff --git a/include/chxj_url_encode.h b/include/chxj_url_encode.h
index d292619..fb5f342 100644 (file)
--- a/include/chxj_url_encode.h
+++ b/include/chxj_url_encode.h
@@ -20,12 +20,12 @@
 #include "mod_chxj.h"
 
 extern char* chxj_url_encode(
-  request_rec* r, 
-  const char*  src);
+  request_rec*       r, 
+  const char*        src);
 
 extern char* chxj_url_decode(
-  request_rec* r, 
-  const char*  src);
+  request_rec*       r, 
+  const char*        src);
 
 #endif
 /*

diff --git a/include/qs_ignore_sp.h b/include/qs_ignore_sp.h
index 5b0dfdc..181088c 100644 (file)
--- a/include/qs_ignore_sp.h
+++ b/include/qs_ignore_sp.h
@@ -19,13 +19,13 @@
 #include "qs_parse_string.h"
 
 extern int qs_ignore_sp(
-  Doc* doc, 
+  Doc*            doc, 
   const char*, 
   int);
 
 extern int qs_ignore_sp_and_quote(
-  Doc* doc, 
-  const char* s, 
-  int len) ;
+  Doc*         doc, 
+  const char*  s, 
+  int          len) ;
 
 #endif

diff --git a/include/qs_log.h b/include/qs_log.h
index bb2e8d2..26686cc 100644 (file)
--- a/include/qs_log.h
+++ b/include/qs_log.h
@@ -16,6 +16,7 @@
  */
 #ifndef __QS_LOG_H__
 #define __QS_LOG_H__
+
 #include "qs_parse_string.h"
 
 #define QX_LOGMARK   __FILE__,__LINE__

diff --git a/include/qs_malloc.h b/include/qs_malloc.h
index dd6e21a..b4e594c 100644 (file)
--- a/include/qs_malloc.h
+++ b/include/qs_malloc.h
@@ -16,6 +16,7 @@
  */
 #ifndef __QS_MALLOC_H__
 #define __QS_MALLOC_H__
+
 #include "qs_parse_string.h"
 
 extern void qs_init_malloc(

diff --git a/include/qs_parse_attr.h b/include/qs_parse_attr.h
index 1c74519..6bbb3d7 100644 (file)
--- a/include/qs_parse_attr.h
+++ b/include/qs_parse_attr.h
@@ -26,7 +26,7 @@ extern Attr* qs_parse_attr(
   int*        newpos);
 
 extern Attr* qs_new_attr(
-  Doc* doc);
+  Doc*        doc);
 
 #endif
 /*

diff --git a/include/qs_parse_string.h b/include/qs_parse_string.h
index c55eb81..45e2594 100644 (file)
--- a/include/qs_parse_string.h
+++ b/include/qs_parse_string.h
@@ -194,7 +194,8 @@ extern char* qs_get_node_name(
 extern int qs_get_node_size(Doc* doc, Node* node) ;
 
 extern Node* qs_get_child_node(Doc* doc, Node* node) ;
-Node* qs_get_next_node(Doc* doc, Node* node) ;
+extern Node* qs_get_next_node(Doc* doc, Node* node) ;
+
 Attr* qs_get_attr(Doc* doc, Node* node) ;
 Attr* qs_get_next_attr(Doc* doc, Attr* attr) ;
 char* qs_get_attr_name(Doc* doc, Attr* attr) ;

diff --git a/include/qs_parse_tag.h b/include/qs_parse_tag.h
index a62c413..89b82a6 100644 (file)
--- a/include/qs_parse_tag.h
+++ b/include/qs_parse_tag.h
@@ -19,9 +19,18 @@
 
 #include "qs_parse_string.h"
 
-extern Node* qs_parse_tag(Doc* doc, const char* s, int len) ;
-extern Node* qs_new_tag(Doc* doc);
-extern Node* qs_add_attr(Doc* doc, Node* node, Attr* attr);
+extern Node* qs_parse_tag(
+  Doc* doc, 
+  const char* s, 
+  int len) ;
+
+extern Node* qs_new_tag(
+  Doc* doc);
+
+extern Node* qs_add_attr(
+  Doc* doc,
+  Node* node, 
+  Attr* attr);
 
 #endif
 /*

diff --git a/src/chxj_calc_ecc.c b/src/chxj_calc_ecc.c
index cf80b87..1301d12 100644 (file)
--- a/src/chxj_calc_ecc.c
+++ b/src/chxj_calc_ecc.c
@@ -1008,11 +1008,14 @@ chxj_calc_ecc(qr_code_t* qrcode,
 #ifdef QR_CODE_DEBUG
       /* for DEBUG */
       do {
-        char* debug_rows = apr_palloc(r->pool, 1);
+        char* debug_rows;
+
+        debug_rows    = apr_palloc(r->pool, 1);
         debug_rows[0] = 0;
-        for (jj=ecc_count + data_count - 1; jj>=0; jj--) {
+
+        for (jj=ecc_count + data_count - 1; jj>=0; jj--)
           debug_rows = apr_pstrcat(r->pool, debug_rows, apr_psprintf(r->pool, "[%d]", tmp[jj]), NULL);
-        }
+
         DBG1(r,"rows [%s]", debug_rows);
       } while(0);
       /* for DEBUG END */
@@ -1036,20 +1039,22 @@ chxj_calc_ecc(qr_code_t* qrcode,
 #ifdef QR_CODE_DEBUG
         /* for DEBUG */
         do {
-          char* debug_rows = apr_palloc(r->pool, 1);
+          char* debug_rows;
+
+          debug_rows = apr_palloc(r->pool, 1);
           debug_rows[0] = 0;
-          for (jj=ecc_count + data_count - 1; jj>=0; jj--) {
+          for (jj=ecc_count + data_count - 1; jj>=0; jj--)
             debug_rows = apr_pstrcat(r->pool, debug_rows, apr_psprintf(r->pool, "[%d]", tmp[jj]), NULL);
-          }
+
           DBG1(r,"rows [%s]", debug_rows);
         } while(0);
         /* for DEBUG END */
 #endif
       }
 
-      for (; ii>=0; ii--) {
+      for (; ii>=0; ii--)
         rs_block[now_rs_num][rs_ii++] = tmp[ii];
-      }
+
       now_rs_num++;
     }
   }

diff --git a/src/qs_log.c b/src/qs_log.c
index 307edb5..7001e10 100644 (file)
--- a/src/qs_log.c
+++ b/src/qs_log.c
@@ -96,15 +96,19 @@ qs_log_int(Doc* doc, int log_level,const char* f, int l, char*msg, int val)
     fprintf(stderr, "DBG:[%20.20s][%10d]: - <%s:%d>\n", f,l,msg, val);
 #endif
     break;
+
   case QX_LOG_INFO:
     fprintf(stderr, "INF:[%20.20s][%10d]: - <%s:%d>\n", f,l,msg,val);
     break;
+
   case QX_LOG_WARN:
     fprintf(stderr, "WRN:[%20.20s][%10d]: - <%s:%d>\n", f,l,msg,val);
     break;
+
   case QX_LOG_ERROR:
     fprintf(stderr, "ERR:[%20.20s][%10d]: - <%s:%d>\n", f,l,msg,val);
     break;
+
   case QX_LOG_FATAL:
     fprintf(stderr, "FTL:[%20.20s][%10d]: - <%s:%d>\n", f,l,msg,val);
     _exit(0);

diff --git a/src/qs_parse_tag.c b/src/qs_parse_tag.c
index 54243a8..be381da 100644 (file)
--- a/src/qs_parse_tag.c
+++ b/src/qs_parse_tag.c
@@ -71,6 +71,7 @@ qs_parse_tag(Doc* doc, const char* s, int len)
   }
 
   QX_LOGGER_DEBUG("end parse_tag()");
+
   return node;
 }