From dfa27ee8b46ca2eae743a09adf5cc639857105ff Mon Sep 17 00:00:00 2001 From: konn Date: Mon, 3 Jul 2006 17:35:52 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1665 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- include/chxj_qr_code.h | 2 +- include/chxj_specified_device.h | 2 +- include/chxj_tag_util.h | 2 +- include/chxj_url_encode.h | 4 +++- include/mod_chxj.h | 6 ++++-- src/chxj_chtml30.c | 2 +- src/chxj_encoding.c | 1 + src/chxj_hdml.c | 2 +- src/chxj_img_conv_format.c | 2 ++ src/chxj_jhtml.c | 2 +- src/chxj_load_device_data.c | 3 ++- src/chxj_qr_code.c | 4 ++-- 12 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h index 579b3e75..a8f2db69 100644 --- a/include/chxj_qr_code.h +++ b/include/chxj_qr_code.h @@ -118,7 +118,7 @@ struct qr_code_t { }; extern int -chxj_qr_code_handler (request_rec* r); +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 void chxj_qrcode_node_to_qrcode (qr_code_t* qrcode, Node* root); extern char* chxj_qr_code_blob_handler (request_rec* r, const char* indata, size_t* len); diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h index 3edea4b4..bb4d2bd8 100644 --- a/include/chxj_specified_device.h +++ b/include/chxj_specified_device.h @@ -50,7 +50,7 @@ struct device_table_t { /* Walll Paper Size */ /*--------------------------------------------------------------------------*/ int wp_width; - int wp_heigh; + int wp_heigh; /*--------------------------------------------------------------------------*/ /* Cache Size */ /*--------------------------------------------------------------------------*/ diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h index fcb59ee3..261227b7 100644 --- a/include/chxj_tag_util.h +++ b/include/chxj_tag_util.h @@ -33,7 +33,7 @@ extern char* qs_get_accesskey_attr (Doc* doc, Node* tag, request_rec* r); extern int qs_is_checked_checkbox_attr(Doc* doc, Node* tag, request_rec* r); -char* qs_get_selected_value_text(Doc *doc, Node* node, request_rec* r); +extern char* qs_get_selected_value_text(Doc *doc, Node* node, request_rec* r); char* qs_get_selected_value(Doc* doc, Node* node, request_rec* r); char* qs_alloc_zero_byte_string(request_rec* r); diff --git a/include/chxj_url_encode.h b/include/chxj_url_encode.h index 31d7bb53..76816b88 100644 --- a/include/chxj_url_encode.h +++ b/include/chxj_url_encode.h @@ -23,7 +23,9 @@ extern char* chxj_url_encode( request_rec* r, const char* src); -extern char* chxj_url_decode(request_rec* r, const char* src); + +extern char* +chxj_url_decode(request_rec* r, const char* src); #endif /* diff --git a/include/mod_chxj.h b/include/mod_chxj.h index 4aa44f8f..ba89590d 100644 --- a/include/mod_chxj.h +++ b/include/mod_chxj.h @@ -154,12 +154,14 @@ #endif -typedef struct _imode_emoji_t { +typedef struct imode_emoji_t imode_emoji_t; + +struct imode_emoji_t { char hex1byte; char hex2byte; char* string; char *description; -} imode_emoji_t; +}; typedef struct _ezweb_emoji_t { char* typeA; diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c index ecca7d7f..8fa849bd 100644 --- a/src/chxj_chtml30.c +++ b/src/chxj_chtml30.c @@ -1029,7 +1029,7 @@ s_chtml30_start_a_tag(void* pdoc, Node* node) chtml30->out = apr_pstrcat(r->pool, chtml30->out, " cti=\"", - value, + value, "\"", NULL); } diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c index e0d1e60c..be8103ce 100644 --- a/src/chxj_encoding.c +++ b/src/chxj_encoding.c @@ -175,6 +175,7 @@ chxj_rencoding(request_rec *r, const char* src, apr_size_t* len) return spos; } + char* chxj_encoding_parameter(request_rec* r, const char* value) { diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c index 55b2486a..8456a2c0 100644 --- a/src/chxj_hdml.c +++ b/src/chxj_hdml.c @@ -1467,7 +1467,7 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag) s_output_to_hdml_out(hdml, apr_psprintf(r->pool, "[$%s%02d]\n" , - s_get_form_no(r, hdml), + s_get_form_no(r, hdml), hdml->var_cnt[hdml->pure_form_cnt])); /*--------------------------------------------------------------------------*/ diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 11dbb0eb..2c1ad222 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -165,6 +165,7 @@ static char* s_create_workfile( request_rec*, mod_chxj_config* , const char*, query_string_param_t*); + static apr_status_t s_create_cache_file(request_rec* r, const char* tmpfile, device_table* spec, @@ -175,6 +176,7 @@ static apr_status_t s_send_cache_file( device_table* spec, query_string_param_t* query_string, request_rec* r, const char* tmpfile); + static apr_status_t s_header_only_cache_file( device_table* spec, query_string_param_t* query_string, diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c index b4585c28..b7b10bbb 100644 --- a/src/chxj_jhtml.c +++ b/src/chxj_jhtml.c @@ -1055,7 +1055,7 @@ s_jhtml_start_a_tag(void* pdoc, Node* node) /* It is special only for CHTML. */ /*----------------------------------------------------------------------*/ jhtml->out = apr_pstrcat(r->pool, - jhtml->out, + jhtml->out, " utn ", NULL); } diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c index 8ae9ab65..8093b1a3 100644 --- a/src/chxj_load_device_data.c +++ b/src/chxj_load_device_data.c @@ -30,7 +30,8 @@ static void s_set_devices_data( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, - Node* node) ; + Node* node) ; + static void s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) ; static void s_set_device_data(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 eb347712..f53240ae 100644 --- a/src/chxj_qr_code.c +++ b/src/chxj_qr_code.c @@ -680,8 +680,8 @@ chxj_qr_code_blob_handler(request_rec* r, const char* indata, size_t* len) int chxj_qrcode_create_image_data( qr_code_t* qrcode, - char** img, - size_t* img_len) + char** img, + size_t* img_len) { int xx, yy; int module_count; -- 2.11.0