--- parser3/src/classes/xnode.C 2003/11/06 09:15:16 1.60 +++ parser3/src/classes/xnode.C 2004/02/11 15:33:13 1.65 @@ -1,13 +1,13 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/11/06 09:15:16 $"; +static const char * const IDENT_XNODE_C="$Date: 2004/02/11 15:33:13 $"; #include "pa_vmethod_frame.h" @@ -111,7 +111,6 @@ GdomeNode* as_node(MethodParams& params, throw Exception("parser.runtime", 0, msg); - result=0; // calm, compiler } return result; @@ -155,10 +154,10 @@ static void _replaceChild(Request& r, Me VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* selfNode=vnode.get_node(); GdomeNode* newChild=as_node(params, 0, "newChild must be node"); - GdomeNode* refChild=as_node(params, 1, "refChild must be node"); + GdomeNode* oldChild=as_node(params, 1, "oldChild must be node"); GdomeException exc; - if(GdomeNode* retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) { + if(GdomeNode* retNode=gdome_n_replaceChild(selfNode, newChild, oldChild, &exc)) { // write out result r.write_no_lang(*new VXnode(&r.charsets, retNode)); } else @@ -233,7 +232,7 @@ GdomeElement* get_self_element(Request& -// DOMString getAttribute(in DOMString name); +/// @bug attribute_value must be freed! [// DOMString getAttribute(in DOMString name); static void _getAttribute(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); const String& name=params.as_string(0, "name must be string"); @@ -575,7 +574,7 @@ static void selectNodeHandler(Request& r } } -static void selectBoolHandler(Request& r, +static void selectBoolHandler(Request&, const String& expression, xmlXPathObject_auto_ptr res, Value*& result) { @@ -595,7 +594,7 @@ static void selectBoolHandler(Request& r } } -static void selectNumberHandler(Request& r, +static void selectNumberHandler(Request&, const String& expression, xmlXPathObject_auto_ptr res, Value*& result) {