*** empty log message ***

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

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index 1f3a8dc..482ca93 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -86,7 +86,8 @@ extern char* qs_trim_string(
 
 extern int   chxj_chxjif_is_mine(
   device_table* spec, 
-  Doc* doc, Node* tag);
+  Doc* doc, 
+  Node* tag);
 
 extern char* qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);
 

diff --git a/include/qs_malloc.h b/include/qs_malloc.h
index d679145..fc2e93b 100644 (file)
--- a/include/qs_malloc.h
+++ b/include/qs_malloc.h
@@ -25,4 +25,5 @@ extern void qs_all_free(
   Doc*        doc, 
   const char* fname,
   int line);
+
 #endif

diff --git a/include/qs_parse_file.h b/include/qs_parse_file.h
index 8cf8803..48ab5cc 100644 (file)
--- a/include/qs_parse_file.h
+++ b/include/qs_parse_file.h
@@ -23,5 +23,6 @@
  */
 extern Node* qs_parse_file(
   Doc* doc, 
-  const char* filename) ;
+  const char* filename);
+
 #endif

diff --git a/include/qs_parse_string.h b/include/qs_parse_string.h
index dc1aef8..b7c2223 100644 (file)
--- a/include/qs_parse_string.h
+++ b/include/qs_parse_string.h
@@ -182,7 +182,8 @@ extern Node* qs_parse_string(
   const char* ss, 
   int         len);
 
-extern char* qs_get_node_value(Doc* doc,Node* node);
+extern char* qs_get_node_value(
+  Doc* doc,Node* node);
 
 extern char* qs_get_node_name(Doc* doc, Node* node) ;
 

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index d3caa19..2998a04 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -40,7 +40,9 @@ static void s_set_user_agent_data(
 
 static void s_set_device_data(
   Doc*        doc, 
-  apr_pool_t* p, device_table_list* dtl, Node* node) ;
+  apr_pool_t* p, 
+  device_table_list* dtl, 
+  Node* node) ;
 
 
 /**

diff --git a/src/chxj_qr_code.c b/src/chxj_qr_code.c
index 8378d06..8fd7b70 100644 (file)
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -2168,11 +2168,13 @@ s_count_same_module(qr_ver_t ver, char* dst[])
   int module_count;
   int point;
   int xx, yy;
-  int same_count = 0;
-  int prev_value = -1;
+  int same_count;
+  int prev_value;
 
   module_count = v_module_count_table[ver];
   point        = 0;
+  same_count   = 0;
+  prev_value   = -1;
 
   /* ²£Êý¸þ¤Ç¥Á¥§¥Ã¥¯ */
   for (yy=0; yy<module_count; yy++) {

diff --git a/src/qs_parse_attr.c b/src/qs_parse_attr.c
index c1cad2f..b1b4450 100644 (file)
--- a/src/qs_parse_attr.c
+++ b/src/qs_parse_attr.c
@@ -156,9 +156,6 @@ qs_parse_attr(Doc* doc, const char*s, int len, int *pos)
   attr->name  = name;
   attr->value = value;
 
-  QX_LOGGER_DEBUG(attr->name);
-  QX_LOGGER_DEBUG(attr->value);
-
   QX_LOGGER_DEBUG("end qs_parse_attr()");
   *pos = ii;
 

diff --git a/src/qs_parse_string.c b/src/qs_parse_string.c
index 599bd7f..42fbc7d 100644 (file)
--- a/src/qs_parse_string.c
+++ b/src/qs_parse_string.c
@@ -81,12 +81,18 @@ qs_parse_string(Doc* doc, const char* src, int srclen)
           if ((*parse_attr->name == 'e' || *parse_attr->name == 'E')
           &&   strcasecmp(parse_attr->name, "encoding") == 0) {
             switch (*parse_attr->value) {
+            case 'X':
+            case 'x':
+              if (strcasecmp(parse_attr->value, "x-sjis"   ) == 0) {
+                strcpy((char*)encoding, (char*)"NONE");
+              }
+              break;
+
             case 'S':
             case 's':
               if ((strcasecmp(parse_attr->value, "Shift_JIS") == 0)
-              ||  (strcasecmp(parse_attr->value, "sjis"     ) == 0)
-              ||  (strcasecmp(parse_attr->value, "Shift-JIS") == 0)
-              ||  (strcasecmp(parse_attr->value, "x-sjis"   ) == 0)) {
+              ||  (strcasecmp(parse_attr->value, "SJIS"     ) == 0)
+              ||  (strcasecmp(parse_attr->value, "Shift-JIS") == 0)) {
                 strcpy((char*)encoding, (char*)"NONE");
               }
               break;

diff --git a/src/qs_parse_tag.c b/src/qs_parse_tag.c
index 04e8b97..574ce1d 100644 (file)
--- a/src/qs_parse_tag.c
+++ b/src/qs_parse_tag.c
@@ -44,7 +44,6 @@ qs_parse_tag(Doc* doc, const char* s, int len)
    * s[0] == '<' && s[len-1] == '>' 
    */
   tag_name = (char *)s_get_tag_name(doc, ++s, --ll);
-  QX_LOGGER_DEBUG_INT("ll",ll);
 
   node = (Node*)qs_new_tag(doc);
   node->name = tag_name;