From 38b217ff47ce3497f25ba3f4fbca262378a40a67 Mon Sep 17 00:00:00 2001 From: mws Date: Tue, 22 Dec 2009 12:45:04 +0000 Subject: [PATCH] declaration of 'const XML_Char* s' shadows a parameter git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@111 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8d77d862fc18105a29b934bed118162386106300 Author: mws Date: 2009-12-22 (Tue, 22 Dec 2009) --- lib/xmltree/xmlparse.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/xmltree/xmlparse.cpp b/lib/xmltree/xmlparse.cpp index df771fcfa..a1df385fd 100644 --- a/lib/xmltree/xmlparse.cpp +++ b/lib/xmltree/xmlparse.cpp @@ -1379,13 +1379,13 @@ enum XML_Error XML_Parser::processXmlDecl(int isGeneralTextEntity, const char *s else if (encodingName) { enum XML_Error result; - const XML_Char *s=poolStoreString(&tempPool, encoding, encodingName, + const XML_Char *s1=poolStoreString(&tempPool, encoding, encodingName, encodingName + XmlNameLength(encoding, encodingName)); - if (!s) return XML_ERROR_NO_MEMORY; + if (!s1) return XML_ERROR_NO_MEMORY; - result=handleUnknownEncoding(s); + result=handleUnknownEncoding(s1); poolDiscard(&tempPool);