mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix shadowed things

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@112 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
mws
2009-12-22 12:47:51 +00:00
parent 8d77d862fc
commit a1a9508a3b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/xmltree/xmltree.cpp
View File

@@ -35,7 +35,7 @@
* First release of the XMLTree API (ryg) * First release of the XMLTree API (ryg)
* *
*/ */
#define stricmp strcasecmp #define stricmp strcasecmp
#include <string.h> #include <string.h>
@@ -346,16 +346,16 @@ void XMLTreeNode::SetMatchingMode(matchmode mode)
void XMLTreeNode::DeleteAttribute(char *name) void XMLTreeNode::DeleteAttribute(char *name)
{ {
XMLAttribute *a, *next, *prev; XMLAttribute *a, *next1, *prev;
a=GetAttribute(name); a=GetAttribute(name);
if (!a) return; if (!a) return;
next=a->GetNext(); next1=a->GetNext();
prev=a->GetPrevious(); prev=a->GetPrevious();
if (prev) prev->SetNext(next); if (prev) prev->SetNext(next1);
if (next) next->SetPrevious(prev); if (next1) next1->SetPrevious(prev);
delete a; delete a;
} }
@@ -391,10 +391,10 @@ void XMLTreeNode::DeleteChildren()
child=0; child=0;
} }
void XMLTreeParser::StartElementHandler(const XML_Char *name, const XML_Char **atts) void XMLTreeParser::StartElementHandler(const XML_Char *name, const XML_Char **patts)
{ {
XMLTreeNode *n; XMLTreeNode *n;
const XML_Char **a=atts; const XML_Char **a=patts;
n=new XMLTreeNode(current, (char *) name); n=new XMLTreeNode(current, (char *) name);
@@ -402,7 +402,7 @@ void XMLTreeParser::StartElementHandler(const XML_Char *name, const XML_Char **a
{ {
while (*a) { n->SetAttribute((char *) a[0], (char *) a[1]); a+=2; }; while (*a) { n->SetAttribute((char *) a[0], (char *) a[1]); a+=2; };
} }
if (current) if (current)
{ {
n->SetPDataOff(current->GetDataSize()); n->SetPDataOff(current->GetDataSize());
@@ -429,7 +429,7 @@ void XMLTreeParser::CharacterDataHandler(const XML_Char *s, int len)
current->AppendData((char *) s, len); current->AppendData((char *) s, len);
} }
XMLTreeParser::XMLTreeParser(const XML_Char *encoding): XML_Parser(encoding) XMLTreeParser::XMLTreeParser(const XML_Char *encoding1): XML_Parser(encoding1)
{ {
root=current=0; root=current=0;