From b029ed9e2944973a494706a8e97e2036ac234176 Mon Sep 17 00:00:00 2001 From: konn Date: Fri, 11 Jan 2008 14:52:24 +0000 Subject: [PATCH] * for AMD64 git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1780 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_apply_convrule.c | 2 +- src/chxj_cookie.c | 13 ++++++------- src/chxj_encoding.c | 4 ++-- src/chxj_hdml.c | 2 +- src/chxj_img_conv_format.c | 10 +++++----- src/chxj_load_device_data.c | 2 +- src/chxj_specified_device.c | 4 ++-- src/mod_chxj.c | 4 ++-- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/chxj_apply_convrule.c b/src/chxj_apply_convrule.c index 40f01c6c..c18214ab 100644 --- a/src/chxj_apply_convrule.c +++ b/src/chxj_apply_convrule.c @@ -50,7 +50,7 @@ s_apply_rule(request_rec* r, chxjconvrule_entry* pp) DBG2(r,"convert rule pattern=[%s] uri=[%s]", pp->pattern, uri); - rtn = ap_regexec(pp->regexp, uri, AP_MAX_REG_MATCH, regmatch, 0); + rtn = ap_regexec((const ap_regex_t*)pp->regexp, uri, AP_MAX_REG_MATCH, (ap_regmatch_t*)regmatch, 0); if (rtn == 0) { /* Match */ if (pp->flags & CONVRULE_FLAG_NOTMATCH) { diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c index b0a018a5..7e2a0985 100644 --- a/src/chxj_cookie.c +++ b/src/chxj_cookie.c @@ -794,16 +794,15 @@ chxj_cookie_db_lock_name_create(request_rec* r, const char* dir) DBG(r, "start chxj_cookie_db_lock_name_create()"); if (!dir) { -DBG(r, " "); + DBG(r, " "); dst = apr_pstrdup(r->pool, DEFAULT_COOKIE_DB_DIR); -DBG(r, " "); + DBG(r, " "); } else { -DBG1(r, " dir=[%x]", (unsigned int)dir); dst = apr_pstrdup(r->pool, dir); -DBG(r, " "); + DBG(r, " "); } -DBG1(r, "dst[strlen(dst)-1]=[%c]", dst[strlen(dst)-1]); + DBG1(r, "dst[strlen(dst)-1]=[%c]", dst[strlen(dst)-1]); if (dst[strlen(dst)-1] != '/') { dst = apr_pstrcat(r->pool, dst, "/", COOKIE_DB_LOCK_NAME, NULL); } @@ -1080,7 +1079,7 @@ chxj_cookie_expire_gc(request_rec* r) retval = apr_dbm_firstkey(f, &dbmkey); if (retval == APR_SUCCESS) { - DBG2(r, "firstkey=[%.*s]", dbmkey.dsize, dbmkey.dptr); + DBG2(r, "firstkey=[%.*s]", (int)dbmkey.dsize, dbmkey.dptr); do { char* tmp; char* old_cookie_id; @@ -1104,7 +1103,7 @@ chxj_cookie_expire_gc(request_rec* r) cmp_time = now_time - dconf->cookie_timeout; DBG1(r, "dconf->cookie_timeout=[%d]", (int)dconf->cookie_timeout); - DBG4(r, "key=[%.*s] cmp_time=[%d] val_time=[%d]", dbmkey.dsize, dbmkey.dptr, cmp_time, val_time); + DBG4(r, "key=[%.*s] cmp_time=[%d] val_time=[%d]", (int)dbmkey.dsize, dbmkey.dptr, cmp_time, val_time); if (cmp_time >= val_time) { apr_dbm_delete(f, dbmkey); diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c index c050b9af..2e6e2f19 100644 --- a/src/chxj_encoding.c +++ b/src/chxj_encoding.c @@ -97,7 +97,7 @@ chxj_encoding(request_rec *r, const char* src, apr_size_t* len) *len = olen; iconv_close(cd); - DBG3(r,"end chxj_encoding() len=[%d] obuf=[%.*s]", *len, *len, spos); + DBG3(r,"end chxj_encoding() len=[%d] obuf=[%.*s]", (int)*len, (int)*len, spos); return spos; } @@ -174,7 +174,7 @@ chxj_rencoding(request_rec *r, const char* src, apr_size_t* len) *len = olen; iconv_close(cd); - DBG3(r,"end chxj_rencoding() len=[%d] obuf=[%.*s]", *len, *len, spos); + DBG3(r,"end chxj_rencoding() len=[%d] obuf=[%.*s]", (int)*len, (int)*len, spos); return spos; } diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c index 7c931df9..9fe09491 100644 --- a/src/chxj_hdml.c +++ b/src/chxj_hdml.c @@ -408,7 +408,7 @@ chxj_exchange_hdml( memset(ss, 0, srclen + 1); memcpy(ss, src, srclen); - DBG1(r, "input strlen(src)=[%d]\n", srclen); + DBG1(r, "input strlen(src)=[%d]\n", (int)srclen); DBG1(r, "[[[[%s]]]\n", src); qs_init_malloc(&doc); diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 05f9b80a..00a66107 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -1227,7 +1227,7 @@ s_img_down_sizing(MagickWand* magick_wand, request_rec* r, device_table* spec) writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte); if (writebyte >= prev_size || revers_flag) { - DBG2(r, "quality=[%ld] size=[%d]", (long)quality, writebyte); + DBG2(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte); revers_flag = 1; quality += 10; if (quality > 100) { @@ -1241,7 +1241,7 @@ s_img_down_sizing(MagickWand* magick_wand, request_rec* r, device_table* spec) continue; } - DBG2(r, "quality=[%ld] size=[%d]", (long)quality, writebyte); + DBG2(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte); if (spec->cache == 0) break; @@ -1309,7 +1309,7 @@ s_img_down_sizing(MagickWand* magick_wand, request_rec* r, device_table* spec) writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte); - DBG2(r,"now_color=[%ld] size=[%d]", (long)now_color, writebyte); + DBG2(r,"now_color=[%ld] size=[%d]", (long)now_color, (int)writebyte); /* Once per request */ break; @@ -1370,7 +1370,7 @@ s_send_cache_file(device_table* spec, query_string_param_t* query_string, reques ap_send_fd(fout, r, 0, st.size, &sendbyte); apr_file_close(fout); ap_rflush(r); - DBG1(r, "send file data[%d]byte", sendbyte); + DBG1(r, "send file data[%d]byte", (int)sendbyte); } else if (query_string->mode == IMG_CONV_MODE_EZGET) { @@ -1428,7 +1428,7 @@ s_send_cache_file(device_table* spec, query_string_param_t* query_string, reques ap_send_fd(fout, r, query_string->offset, query_string->count, &sendbyte); apr_file_close(fout); ap_rflush(r); - DBG1(r, "send file data[%d]byte", sendbyte); + DBG1(r, "send file data[%d]byte", (int)sendbyte); } } diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c index e8ebc7d0..d748db68 100644 --- a/src/chxj_load_device_data.c +++ b/src/chxj_load_device_data.c @@ -127,7 +127,7 @@ s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node if ((*attr_name == 'p' || *attr_name == 'P') && strcasecmp(attr_name, "pattern") == 0) { dtl->pattern = apr_pstrdup(p, qs_get_attr_value(doc,attr)); - dtl->regexp = ap_pregcomp(p, dtl->pattern, AP_REG_EXTENDED|AP_REG_ICASE); + dtl->regexp = ap_pregcomp(p, (const char *)dtl->pattern, AP_REG_EXTENDED|AP_REG_ICASE); } } s_set_device_data(doc, p, dtl, child); diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c index 6de4e7d4..09583d69 100644 --- a/src/chxj_specified_device.c +++ b/src/chxj_specified_device.c @@ -98,8 +98,8 @@ chxj_specified_device(request_rec* r, const char* user_agent) return returnType; } - if (ap_regexec(dtl->regexp, user_agent, dtl->regexp->re_nsub + 1, match, 0) == 0) { - device_id = ap_pregsub(r->pool, "$1", user_agent, dtl->regexp->re_nsub + 1, match); + if (ap_regexec((const char *)dtl->regexp, user_agent, dtl->regexp->re_nsub + 1, (ap_regmatch_t*)match, 0) == 0) { + device_id = ap_pregsub(r->pool, "$1", user_agent, dtl->regexp->re_nsub + 1, (ap_regmatch_t*)match); DBG1(r, "device_id:[%s]", device_id); for (dt = dtl->table; dt; dt = dt->next) { if (strcasecmp(device_id, dt->device_id) == 0) { diff --git a/src/mod_chxj.c b/src/mod_chxj.c index 447194b2..8eee9350 100644 --- a/src/mod_chxj.c +++ b/src/mod_chxj.c @@ -823,7 +823,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) } else if (apr_bucket_read(b, &data, &len, APR_BLOCK_READ) == APR_SUCCESS) { - DBG2(r, "read data[%.*s]",len, data); + DBG2(r, "read data[%.*s]",(int)len, data); if (f->ctx == NULL) { /*--------------------------------------------------------------------*/ @@ -1721,7 +1721,7 @@ cmd_convert_rule(cmd_parms *cmd, void* mconfig, const char *arg) } mode = AP_REG_EXTENDED; - if ((regexp = ap_pregcomp(cmd->pool, pp, mode)) == NULL) + if ((regexp = ap_pregcomp(cmd->pool, (const char *)pp, mode)) == NULL) return "RewriteRule: cannot compile regular expression "; newrule->regexp = regexp; -- 2.11.0