From f63bcd5ca3ea50acc828f699c88e3ffd32944205 Mon Sep 17 00:00:00 2001 From: konn Date: Tue, 18 Jul 2006 00:38:37 +0000 Subject: [PATCH] * merge from RELEASE_0_8_0 git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1767 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- include/chxj_chtml10.h | 1 + include/chxj_chtml20.h | 1 + include/chxj_cookie.h | 16 ++++++++-------- include/chxj_hdml.h | 14 +++++++------- include/chxj_img_conv.h | 5 +++-- include/chxj_img_conv_format.h | 9 +++------ include/chxj_jhtml.h | 4 ++-- include/chxj_load_device_data.h | 1 + include/chxj_specified_device.h | 2 +- include/chxj_tag_util.h | 8 ++++++-- include/chxj_xhtml_mobile_1_0.h | 1 + include/mod_chxj.h | 14 +++++++------- include/qs_ignore_sp.h | 6 ++++-- include/qs_parse_attr.h | 1 + include/qs_parse_file.h | 1 + include/qs_parse_string.h | 7 +++++-- include/qs_parse_tag.h | 4 +++- 17 files changed, 55 insertions(+), 40 deletions(-) diff --git a/include/chxj_chtml10.h b/include/chxj_chtml10.h index a5e34bd6..002bddf5 100644 --- a/include/chxj_chtml10.h +++ b/include/chxj_chtml10.h @@ -50,4 +50,5 @@ extern char* chxj_exchange_chtml10( apr_size_t* dstlen, chxjconvrule_entry* entryp, cookie_t* cookie); + #endif diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h index e7a2b201..8e3c1b64 100644 --- a/include/chxj_chtml20.h +++ b/include/chxj_chtml20.h @@ -50,4 +50,5 @@ extern char* chxj_exchange_chtml20( apr_size_t* dstlen, chxjconvrule_entry* entryp, cookie_t* cookie); + #endif diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h index d9c81ce3..269c57d2 100644 --- a/include/chxj_cookie.h +++ b/include/chxj_cookie.h @@ -21,17 +21,17 @@ #include "apr_file_io.h" #include "apr_tables.h" -#define CHXJ_COOKIE_PARAM "_chxj_cc" -#define CHXJ_COOKIE_NOUPDATE_PARAM "_chxj_nc" +#define CHXJ_COOKIE_PARAM "_chxj_cc" +#define CHXJ_COOKIE_NOUPDATE_PARAM "_chxj_nc" -#define DEFAULT_COOKIE_DB_DIR "/tmp" -#define COOKIE_DB_NAME "cookie.db" -#define COOKIE_DB_LOCK_NAME "cookie.db.lock" +#define DEFAULT_COOKIE_DB_DIR "/tmp" +#define COOKIE_DB_NAME "cookie.db" +#define COOKIE_DB_LOCK_NAME "cookie.db.lock" -#define COOKIE_EXPIRE_DB_NAME "cookie.expire.db" -#define COOKIE_EXPIRE_DB_LOCK_NAME "cookie.expire.db.lock" +#define COOKIE_EXPIRE_DB_NAME "cookie.expire.db" +#define COOKIE_EXPIRE_DB_LOCK_NAME "cookie.expire.db.lock" -#define REFERER_COOKIE_KEY "CHXJ_REFER" +#define REFERER_COOKIE_KEY "CHXJ_REFER" /* * default cookie timeout is 30 minute diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h index 9179cd3c..0ce7894f 100644 --- a/include/chxj_hdml.h +++ b/include/chxj_hdml.h @@ -20,11 +20,11 @@ /*============================================================================*/ /* The maximum number of form is up to ten. */ /*============================================================================*/ -#define MAX_FORM_COUNT (10) -#define MAX_RADIO_COUNT (10) -#define MAX_RADIO_VALUE_COUNT (100) -#define MAX_SUBMIT_BUTTON_COUNT (10) -#define END_LINE "\0" +#define MAX_FORM_COUNT (10) +#define MAX_RADIO_COUNT (10) +#define MAX_RADIO_VALUE_COUNT (100) +#define MAX_SUBMIT_BUTTON_COUNT (10) +#define END_LINE "\0" #include "mod_chxj.h" #include "chxj_cookie.h" @@ -89,9 +89,9 @@ struct hdml_t { int hdml_end_flag; - device_table* spec; + device_table* spec; - mod_chxj_config* conf; + mod_chxj_config* conf; chxjconvrule_entry* entryp; cookie_t* cookie; diff --git a/include/chxj_img_conv.h b/include/chxj_img_conv.h index 54629eda..f14f78d0 100644 --- a/include/chxj_img_conv.h +++ b/include/chxj_img_conv.h @@ -16,11 +16,12 @@ */ #ifndef __CHXJ_IMG_CONV_H__ #define __CHXJ_IMG_CONV_H__ + #include "mod_chxj.h" -extern char* -chxj_img_conv( +extern char* chxj_img_conv( 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 34b6b730..c2bfe27b 100644 --- a/include/chxj_img_conv_format.h +++ b/include/chxj_img_conv_format.h @@ -21,18 +21,15 @@ #define DEFAULT_IMAGE_CACHE_DIR "/tmp" -extern int -chxj_img_conv_format_handler( +extern int chxj_img_conv_format_handler( request_rec* r); -extern char* -chxj_exchange_image( +extern char* chxj_exchange_image( request_rec* r, const char** src, apr_size_t* len); -extern int -chxj_trans_name( +extern int chxj_trans_name( request_rec *r); diff --git a/include/chxj_jhtml.h b/include/chxj_jhtml.h index 257e138d..2fbec65e 100644 --- a/include/chxj_jhtml.h +++ b/include/chxj_jhtml.h @@ -42,8 +42,7 @@ struct jhtml_t { /*----------------------------------------------------------------------------*/ /* Prototype */ /*----------------------------------------------------------------------------*/ -extern char* -chxj_exchange_jhtml( +extern char* chxj_exchange_jhtml( request_rec* r, device_table* spec, const char* src, @@ -51,4 +50,5 @@ chxj_exchange_jhtml( 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 1858b5f8..61e5603d 100644 --- a/include/chxj_load_device_data.h +++ b/include/chxj_load_device_data.h @@ -16,6 +16,7 @@ */ #ifndef __LOAD_DEVICE_DATA_H__ #define __LOAD_DEVICE_DATA_H__ + #include "mod_chxj.h" extern void chxj_load_device_data( diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h index f77afe53..9de6ffc9 100644 --- a/include/chxj_specified_device.h +++ b/include/chxj_specified_device.h @@ -104,7 +104,7 @@ struct converter_t { const char* src, apr_size_t srclen, apr_size_t* dstlen, - struct chxjconvrule_entry* entryp, + struct chxjconvrule_entry* entryp, cookie_t* cookie); char* (*encoder)(request_rec* r, diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h index 59d67575..d63ecb26 100644 --- a/include/chxj_tag_util.h +++ b/include/chxj_tag_util.h @@ -91,9 +91,13 @@ extern int chxj_chxjif_is_mine( extern char* qs_get_destlang_attr( Doc* doc, - Node* tag, request_rec* r); + Node* tag, + request_rec* r); -extern char* qs_get_parse_attr(Doc* doc, Node* tag, request_rec* r); +extern char* qs_get_parse_attr( + Doc* doc, + Node* tag, + request_rec* r); #endif /* diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h index 97567879..b70a7056 100644 --- a/include/chxj_xhtml_mobile_1_0.h +++ b/include/chxj_xhtml_mobile_1_0.h @@ -23,6 +23,7 @@ /* Structure for HDML */ /*----------------------------------------------------------------------------*/ typedef struct xhtml_t xhtml_t; + struct xhtml_t { Doc* doc; char* out; diff --git a/include/mod_chxj.h b/include/mod_chxj.h index 55afd770..cae022c1 100644 --- a/include/mod_chxj.h +++ b/include/mod_chxj.h @@ -18,7 +18,7 @@ #define __MOD_CHXJ_H__ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) -#define AP_NEED_SET_MUTEX_PERMS +# define AP_NEED_SET_MUTEX_PERMS #endif @@ -348,12 +348,12 @@ module AP_MODULE_DECLARE_DATA chxj_module; #define SERR2(X,Y,Za,Zb) ap_log_error(APLOG_MARK,APLOG_ERR,0,(X),(Y),(Za),(Zb)) extern tag_handlers chxj_tag_handlers[]; -extern tag_handler chtml10_handler[]; -extern tag_handler chtml20_handler[]; -extern tag_handler chtml30_handler[]; -extern tag_handler xhtml_handler[]; -extern tag_handler hdml_handler[]; -extern tag_handler jhtml_handler[]; +extern tag_handler chtml10_handler[]; +extern tag_handler chtml20_handler[]; +extern tag_handler chtml30_handler[]; +extern tag_handler xhtml_handler[]; +extern tag_handler hdml_handler[]; +extern tag_handler jhtml_handler[]; extern char* chxj_node_exchange( device_table* spec, diff --git a/include/qs_ignore_sp.h b/include/qs_ignore_sp.h index 3838ae7b..5b0dfdcf 100644 --- a/include/qs_ignore_sp.h +++ b/include/qs_ignore_sp.h @@ -20,10 +20,12 @@ extern int qs_ignore_sp( Doc* doc, - const char*, int); + const char*, + int); extern int qs_ignore_sp_and_quote( Doc* doc, - const char* s, int len) ; + const char* s, + int len) ; #endif diff --git a/include/qs_parse_attr.h b/include/qs_parse_attr.h index b6872b1a..1c745191 100644 --- a/include/qs_parse_attr.h +++ b/include/qs_parse_attr.h @@ -16,6 +16,7 @@ */ #ifndef __QS_PARSE_ATTR_H__ #define __QS_PARSE_ATTR_H__ + #include "qs_parse_string.h" extern Attr* qs_parse_attr( diff --git a/include/qs_parse_file.h b/include/qs_parse_file.h index db97601a..36aea4db 100644 --- a/include/qs_parse_file.h +++ b/include/qs_parse_file.h @@ -16,6 +16,7 @@ */ #ifndef __QS_PARSE_FILE_H__ #define __QS_PARSE_FILE_H__ + #include "qs_parse_string.h" /* diff --git a/include/qs_parse_string.h b/include/qs_parse_string.h index 43d640e8..c55eb81b 100644 --- a/include/qs_parse_string.h +++ b/include/qs_parse_string.h @@ -16,6 +16,7 @@ */ #ifndef __QS_PARSE_STRING_H__ #define __QS_PARSE_STRING_H__ + #include /* @@ -187,10 +188,12 @@ extern char* qs_get_node_value( Node* node); extern char* qs_get_node_name( - Doc* doc, Node* node) ; + Doc* doc, + Node* node); extern int qs_get_node_size(Doc* doc, Node* node) ; -Node* qs_get_child_node(Doc* doc, Node* node) ; + +extern 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) ; Attr* qs_get_next_attr(Doc* doc, Attr* attr) ; diff --git a/include/qs_parse_tag.h b/include/qs_parse_tag.h index 895c6921..a62c4136 100644 --- a/include/qs_parse_tag.h +++ b/include/qs_parse_tag.h @@ -16,11 +16,13 @@ */ #ifndef __QS_PARSE_TAG_H__ #define __QS_PARSE_TAG_H__ + #include "qs_parse_string.h" extern Node* qs_parse_tag(Doc* doc, const char* s, int len) ; extern Node* qs_new_tag(Doc* doc); -Node* qs_add_attr(Doc* doc, Node* node, Attr* attr); +extern Node* qs_add_attr(Doc* doc, Node* node, Attr* attr); + #endif /* * vim:ts=2 et -- 2.11.0