From 177fcc4505d8b9addedfa714f0688419db5a2341 Mon Sep 17 00:00:00 2001 From: konn Date: Mon, 10 Jul 2006 17:48:06 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1737 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- include/chxj_tag_util.h | 3 ++- include/qs_malloc.h | 2 +- include/qs_parse_file.h | 3 ++- include/qs_parse_string.h | 2 +- src/chxj_encoding.c | 1 + src/chxj_load_device_data.c | 2 +- src/chxj_qr_code.c | 7 +++++-- src/qs_parse_attr.c | 1 + src/qs_parse_tag.c | 4 +++- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h index 2d3554f5..1f3a8dcc 100644 --- a/include/chxj_tag_util.h +++ b/include/chxj_tag_util.h @@ -85,7 +85,8 @@ extern char* qs_trim_string( char* s); extern int chxj_chxjif_is_mine( - device_table* spec, Doc* doc, Node* tag); + device_table* spec, + 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 3b0e31f2..d679145e 100644 --- a/include/qs_malloc.h +++ b/include/qs_malloc.h @@ -22,7 +22,7 @@ extern void qs_init_malloc( Doc* doc); extern void qs_all_free( - Doc* doc, + Doc* doc, const char* fname, int line); #endif diff --git a/include/qs_parse_file.h b/include/qs_parse_file.h index 62f93e59..8cf88033 100644 --- a/include/qs_parse_file.h +++ b/include/qs_parse_file.h @@ -22,5 +22,6 @@ * Prototype Declare */ extern Node* qs_parse_file( - Doc* doc, const char* filename) ; + Doc* doc, + const char* filename) ; #endif diff --git a/include/qs_parse_string.h b/include/qs_parse_string.h index 294ecbd2..dc1aef8e 100644 --- a/include/qs_parse_string.h +++ b/include/qs_parse_string.h @@ -186,7 +186,7 @@ extern char* qs_get_node_value(Doc* doc,Node* node); extern char* qs_get_node_name(Doc* doc, Node* node) ; -int qs_get_node_size(Doc* doc, Node* node) ; +extern int qs_get_node_size(Doc* doc, Node* node) ; Node* qs_get_child_node(Doc* doc, Node* node) ; Node* qs_get_next_node(Doc* doc, Node* node) ; Attr* qs_get_attr(Doc* doc, Node* node) ; diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c index 563fa092..c050b9af 100644 --- a/src/chxj_encoding.c +++ b/src/chxj_encoding.c @@ -135,6 +135,7 @@ chxj_rencoding(request_rec *r, const char* src, apr_size_t* len) if ((*(entryp->encoding) == 'n' || *(entryp->encoding) == 'N') && strcasecmp(entryp->encoding, "NONE") == 0) { DBG(r,"none encoding."); + DBG(r,"end chxj_rencoding()"); return (char*)src; } diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c index 5a744fe2..d3caa196 100644 --- a/src/chxj_load_device_data.c +++ b/src/chxj_load_device_data.c @@ -39,7 +39,7 @@ static void s_set_user_agent_data( Node* node); static void s_set_device_data( - Doc* doc, + Doc* doc, 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 262289bb..8378d06d 100644 --- a/src/chxj_qr_code.c +++ b/src/chxj_qr_code.c @@ -2165,12 +2165,15 @@ s_calc_lost_point(qr_code_t* qrcode, char* dst[]) static int s_count_same_module(qr_ver_t ver, char* dst[]) { - int module_count = v_module_count_table[ver]; - int point = 0; + int module_count; + int point; int xx, yy; int same_count = 0; int prev_value = -1; + module_count = v_module_count_table[ver]; + point = 0; + /* ²£Êý¸þ¤Ç¥Á¥§¥Ã¥¯ */ for (yy=0; yy' */ + /* + * s[0] == '<' && s[len-1] == '>' + */ tag_name = (char *)s_get_tag_name(doc, ++s, --ll); QX_LOGGER_DEBUG_INT("ll",ll); -- 2.11.0