From aff5c45acb020afc1512a42d4418808061526912 Mon Sep 17 00:00:00 2001 From: konn Date: Sat, 24 Jun 2006 12:20:21 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1177 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_xhtml_mobile_1_0.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index d76dc1ab..e0179a7c 100644 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -73,9 +73,9 @@ static char* s_xhtml_1_0_start_input_tag (void* pdoc, Node* node); static char* s_xhtml_1_0_end_input_tag (void* pdoc, Node* node); 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_hr_tag (xhtml_t* xhtml, Node* node); -static char* s_xhtml_1_0_end_hr_tag (xhtml_t* xhtml, 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); @@ -234,12 +234,12 @@ tag_handler xhtml_handler[] = { s_xhtml_1_0_start_center_tag, s_xhtml_1_0_end_center_tag, }, -#if 0 /* tagHR */ { - s_chtml10_start_hr_tag, - s_chtml10_end_hr_tag, + s_xhtml_1_0_start_hr_tag, + s_xhtml_1_0_end_hr_tag, }, +#if 0 /* tagIMG */ { s_chtml10_start_img_tag, @@ -1945,33 +1945,37 @@ s_xhtml_1_0_end_center_tag(void* pdoc, Node* child) /** * It is a handler who processes the HR 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 HR tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_start_hr_tag(xhtml_t* xhtml, Node* node) +s_xhtml_1_0_start_hr_tag(void* pdoc, Node* node) { - Doc* doc = xhtml->doc; - request_rec* r = doc->r; + xhtml_t* xhtml = GET_XHTML(pdoc); + Doc* doc = xhtml->doc; + request_rec* r = doc->r; xhtml->out = apr_pstrcat(r->pool, xhtml->out, "
", NULL); return xhtml->out; } + /** * It is a handler who processes the HR 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 HR tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_end_hr_tag(xhtml_t* xhtml, Node* child) +s_xhtml_1_0_end_hr_tag(void* pdoc, Node* child) { + xhtml_t* xhtml = GET_XHTML(pdoc); + return xhtml->out; } -- 2.11.0