From 67905d22420ac7d13af6c7b983734adddff32d4a Mon Sep 17 00:00:00 2001 From: konn Date: Sat, 24 Jun 2006 12:39:18 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1186 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_xhtml_mobile_1_0.c | 441 +------------------------------------------- 1 file changed, 3 insertions(+), 438 deletions(-) diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index d93c27f0..39d4a34d 100644 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -24,7 +24,6 @@ #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 (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 (void* pdoc, Node* node); @@ -361,7 +360,9 @@ chxj_exchange_xhtml_mobile_1_0( /*--------------------------------------------------------------------------*/ /* It converts it from CHTML to XHTML. */ /*--------------------------------------------------------------------------*/ - dst = s_xhtml_1_0_node_exchange(&xhtml, qs_get_root(&doc), 0); + chxj_node_exchange(spec,r,(void*)&xhtml, &doc, qs_get_root(&doc), 0); + dst = xhtml.out; + qs_all_free(&doc,QX_LOGMARK); if (! dst) @@ -405,442 +406,6 @@ s_init_xhtml(xhtml_t* xhtml, Doc* doc, request_rec* r, device_table* spec) xhtml->doc->parse_mode = PARSE_MODE_CHTML; } -/** - * It is main processing of conversion from CHTML to XHTML. - * - * @param xhtml [i/o] The pointer to the XHTML structure is specified. - * @param node [i] The pointer to a current node is specified. - * @param indent [i] The depth of the node processing it now is specified. - * - * @return The character string after it converts it is returned. - */ -static char* -s_xhtml_1_0_node_exchange(xhtml_t* xhtml, Node* node, int indent) -{ - Node* child; - Doc* doc = xhtml->doc; - request_rec* r = doc->r; - - /*--------------------------------------------------------------------------*/ - /* It is the main loop of the conversion processing. */ - /*--------------------------------------------------------------------------*/ - for (child = qs_get_child_node(doc,node); - child ; - child = qs_get_next_node(doc,child)) { - - char* name = qs_get_node_name(doc,child); - - /*------------------------------------------------------------------------*/ - /*