diff --git a/XMLwrapper.cpp b/XMLwrapper.cpp index 1efb66e..6373629 100644 --- a/XMLwrapper.cpp +++ b/XMLwrapper.cpp @@ -29,7 +29,7 @@ int xml_k=0; char tabs[STACKSIZE+2]; const char *XMLwrapper_whitespace_callback(mxml_node_t *node,int where){ - const char *name=node->value.element.name; + const char *name =mxmlGetElement(node); if ((where==MXML_WS_BEFORE_OPEN)&&(!strcmp(name,"?xml"))) return(NULL); if ((where==MXML_WS_BEFORE_CLOSE)&&(!strcmp(name,"string"))) return(NULL); @@ -407,10 +407,10 @@ void XMLwrapper::getparstr(const char *name,char *par,int maxstrlen){ node=mxmlFindElement(peek(),peek(),"string","name",name,MXML_DESCEND_FIRST); if (node==NULL) return; - if (node->child==NULL) return; - if (node->child->type!=MXML_OPAQUE) return; + if (mxmlGetFirstChild(node) == NULL) return; + if (mxmlGetType(mxmlGetFirstChild(node)) != MXML_OPAQUE) return; - snprintf(par,maxstrlen,"%s",node->child->value.element.name); + snprintf(par,maxstrlen,"%s",mxmlGetText(mxmlGetFirstChild(node), NULL)); };