From 9459bd03bdb520d83039b8d40c70a7f63c50d79f Mon Sep 17 00:00:00 2001 From: konn Date: Sat, 24 Jun 2006 11:35:34 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1159 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_xhtml_mobile_1_0.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index 6cc9f1b3..8e56b4d4 100644 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -25,8 +25,9 @@ #define GET_XHTML(X) ((xhtml_t*)(X)) static char* s_xhtml_1_0_node_exchange (xhtml_t* xhtml, Node* node, int indent); -static char* s_xhtml_1_0_start_html_tag (xhtml_t* xhtml, Node* node); -static char* s_xhtml_1_0_end_html_tag (xhtml_t* xhtml, Node* node); +static char* s_xhtml_1_0_start_html_tag (void* pdoc, Node* node); +static char* s_xhtml_1_0_end_html_tag (void* pdoc, Node* node); + static char* s_xhtml_1_0_start_p_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_end_p_tag (xhtml_t* xhtml, Node* node); static char* s_xhtml_1_0_start_pre_tag (xhtml_t* xhtml, Node* node); @@ -92,12 +93,12 @@ static void s_xhtml_1_0_chxjif_tag(xhtml_t* xhtml, Node* node); tag_handler xhtml_handler[] = { -#if 0 /* tagHTML */ { - s_chtml10_start_html_tag, - s_chtml10_end_html_tag, + s_xhtml_1_0_start_html_tag, + s_xhtml_1_0_end_html_tag, }, +#if 0 /* tagMETA */ { s_chtml10_start_meta_tag, @@ -979,14 +980,15 @@ s_xhtml_search_emoji(xhtml_t* xhtml, char* txt, char** rslt) /** * It is a handler who processes the HTML 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 HTML tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_start_html_tag(xhtml_t* xhtml, Node* node) +s_xhtml_1_0_start_html_tag(void* pdoc, Node* node) { + xhtml_t* xhtml = GET_XHTML(pdoc); Attr* attr; Doc* doc = xhtml->doc; request_rec* r = doc->r; @@ -1048,16 +1050,17 @@ s_xhtml_1_0_start_html_tag(xhtml_t* xhtml, Node* node) /** * It is a handler who processes the HTML 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 HTML tag node is specified. * @return The conversion result is returned. */ static char* -s_xhtml_1_0_end_html_tag(xhtml_t* xhtml, Node* child) +s_xhtml_1_0_end_html_tag(void* pdoc, Node* child) { - 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, "\r\n", NULL); -- 2.11.0