From 08d20d9c36b6abe3a03cfaa44ebfd887ae738eb4 Mon Sep 17 00:00:00 2001 From: konn Date: Mon, 3 Jul 2006 17:29:14 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1662 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 | 3 ++- src/chxj_chtml30.c | 2 +- src/chxj_encoding.c | 2 +- src/chxj_hdml.c | 2 +- src/chxj_img_conv.c | 2 +- src/chxj_img_conv_format.c | 2 +- src/chxj_jhtml.c | 2 +- src/chxj_load_device_data.c | 3 ++- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/chxj_qr_code.h b/include/chxj_qr_code.h index 3ba48993..117be755 100644 --- a/include/chxj_qr_code.h +++ b/include/chxj_qr_code.h @@ -119,7 +119,7 @@ struct qr_code_t { 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); -void chxj_qrcode_node_to_qrcode (qr_code_t* qrcode, Node* root); +extern void chxj_qrcode_node_to_qrcode (qr_code_t* qrcode, Node* root); char* chxj_qr_code_blob_handler (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 871b20f3..75d0cd85 100644 --- a/include/chxj_specified_device.h +++ b/include/chxj_specified_device.h @@ -44,7 +44,7 @@ struct device_table_t { const char* device_id; const char* device_name; spec_type html_spec_type; - int width; + int width; int heigh; /*--------------------------------------------------------------------------*/ /* Walll Paper Size */ diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h index b5f2142b..822685a2 100644 --- a/include/chxj_tag_util.h +++ b/include/chxj_tag_util.h @@ -29,7 +29,7 @@ extern char* qs_get_name_attr (Doc* doc, Node* tag, request_rec* r); extern char* qs_get_istyle_attr (Doc* doc, Node* tag, request_rec* r); extern char* qs_get_maxlength_attr (Doc* doc, Node* tag, request_rec* r); extern char* qs_get_size_attr (Doc* doc, Node* tag, request_rec* r); -char* qs_get_accesskey_attr (Doc* doc, Node* tag, request_rec* r); +extern char* qs_get_accesskey_attr (Doc* doc, Node* tag, request_rec* r); int qs_is_checked_checkbox_attr(Doc* doc, Node* tag, request_rec* r); diff --git a/include/chxj_url_encode.h b/include/chxj_url_encode.h index 3894c55a..6a442517 100644 --- a/include/chxj_url_encode.h +++ b/include/chxj_url_encode.h @@ -21,7 +21,8 @@ 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); #endif diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c index 86f4414b..fae7070d 100644 --- a/src/chxj_chtml30.c +++ b/src/chxj_chtml30.c @@ -1007,7 +1007,7 @@ s_chtml30_start_a_tag(void* pdoc, Node* node) " href=\"", value, "\"", - NULL); + NULL); } else if (strcasecmp(name, "accesskey") == 0) { diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c index 6ca041ab..081061cf 100644 --- a/src/chxj_encoding.c +++ b/src/chxj_encoding.c @@ -147,7 +147,7 @@ chxj_rencoding(request_rec *r, const char* src, apr_size_t* len) olen = ilen * 4 + 1; spos = obuf = apr_palloc(r->pool, olen); - if (obuf == NULL) { + if (! obuf) { DBG(r,"end chxj_rencoding()"); return ibuf; } diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c index 995ddcf9..9ae36b8d 100644 --- a/src/chxj_hdml.c +++ b/src/chxj_hdml.c @@ -1462,7 +1462,7 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag) s_get_form_no(r, hdml), hdml->var_cnt[hdml->pure_form_cnt], s_get_form_no(r, hdml), - hdml->var_cnt[hdml->pure_form_cnt] + hdml->var_cnt[hdml->pure_form_cnt] )); s_output_to_hdml_out(hdml, diff --git a/src/chxj_img_conv.c b/src/chxj_img_conv.c index 4f95a32d..d751e367 100644 --- a/src/chxj_img_conv.c +++ b/src/chxj_img_conv.c @@ -48,7 +48,7 @@ chxj_img_conv( if (spec->available_gif) return apr_pstrcat(r->pool, dst, ".gif", NULL); - if (spec->available_bmp4 != 0 || spec->available_bmp2 != 0) + if (spec->available_bmp4 || spec->available_bmp2 != 0) return apr_pstrcat(r->pool, dst, ".bmp", NULL); } diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index c664a6d0..ce9540e1 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -165,7 +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, +static apr_status_t s_create_cache_file(request_rec* r, const char* tmpfile, device_table* spec, apr_finfo_t* st, diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c index e42d7aec..e27037f1 100644 --- a/src/chxj_jhtml.c +++ b/src/chxj_jhtml.c @@ -1037,7 +1037,7 @@ s_jhtml_start_a_tag(void* pdoc, Node* node) jhtml->out = apr_pstrcat(r->pool, jhtml->out, " cti=\"", - value, + value, "\"", NULL); } diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c index 60677009..512048da 100644 --- a/src/chxj_load_device_data.c +++ b/src/chxj_load_device_data.c @@ -28,7 +28,8 @@ static void s_set_devices_data( Doc* doc, - apr_pool_t* p, mod_chxj_config* conf, Node* node) ; + apr_pool_t* p, + mod_chxj_config* conf, 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) ; /** -- 2.11.0