From 47b7f732d00952c913a77835a05ec7e3cb120c26 Mon Sep 17 00:00:00 2001 From: konn Date: Sat, 24 Jun 2006 12:22:02 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1178 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_xhtml_mobile_1_0.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index e0179a7c..7f7bcfb3 100644 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -75,9 +75,9 @@ static char* s_xhtml_1_0_start_center_tag (void* pdoc, Node* node); static char* s_xhtml_1_0_end_center_tag (void* pdoc, Node* node); static char* s_xhtml_1_0_start_hr_tag (void* pdoc, Node* node); static char* s_xhtml_1_0_end_hr_tag (void* pdoc, Node* node); +static char* s_xhtml_1_0_start_img_tag (void* pdoc, Node* node); +static char* s_xhtml_1_0_end_img_tag (void* pdoc, Node* node); -static char* s_xhtml_1_0_start_img_tag (xhtml_t* xhtml, Node* node); -static char* s_xhtml_1_0_end_img_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_start_select_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_end_select_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_start_option_tag (xhtml_t* xhtml, Node* node); @@ -239,12 +239,12 @@ tag_handler xhtml_handler[] = { s_xhtml_1_0_start_hr_tag, s_xhtml_1_0_end_hr_tag, }, -#if 0 /* tagIMG */ { - s_chtml10_start_img_tag, - s_chtml10_end_img_tag, + s_xhtml_1_0_start_img_tag, + s_xhtml_1_0_end_img_tag, }, +#if 0 /* tagSELECT */ { s_chtml10_start_select_tag, @@ -2445,17 +2445,18 @@ s_xhtml_1_0_end_li_tag(void* pdoc, Node* child) /** * It is a handler who processes the IMG tag. * - * @param xhtml [i/o] The pointer to the XHTML structure at the output + * @param pdoc [i/o] The pointer to the XHTML structure at the output * destination is specified. * @param node [i] The IMG tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_start_img_tag(xhtml_t* xhtml, Node* node) +s_xhtml_1_0_start_img_tag(void* pdoc, Node* node) { - Doc* doc = xhtml->doc; - request_rec* r = doc->r; - Attr* attr; + xhtml_t* xhtml = GET_XHTML(pdoc); + Doc* doc = xhtml->doc; + request_rec* r = doc->r; + Attr* attr; #ifndef IMG_NOT_CONVERT_FILENAME device_table_t* spec = xhtml->spec; @@ -2523,6 +2524,7 @@ s_xhtml_1_0_start_img_tag(xhtml_t* xhtml, Node* node) return xhtml->out; } + /** * It is a handler who processes the IMG tag. * @@ -2532,11 +2534,14 @@ s_xhtml_1_0_start_img_tag(xhtml_t* xhtml, Node* node) * @return The conversion result is returned. */ static char* -s_xhtml_1_0_end_img_tag(xhtml_t* xhtml, Node* child) +s_xhtml_1_0_end_img_tag(void* pdoc, Node* child) { + xhtml_t* xhtml = GET_XHTML(pdoc); + return xhtml->out; } + /** * It is a handler who processes the SELECT tag. * -- 2.11.0