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

xmlinterface.cpp remove encoding option for load_string

Browse Source
This commit is contained in:
Jacek Jendrzej
2015-04-30 21:22:47 +02:00
parent 206dbec426
commit c3a8c2d95d
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/xmltree/xmlinterface.cpp
View File

@@ -208,25 +208,11 @@ xmlDocPtr parseXmlFile(const char * filename, bool warning_by_nonexistence /* =
#elif (defined( USE_PUGIXML ) ) #elif (defined( USE_PUGIXML ) )
#include <fstream> #include <fstream>
pugi::xml_encoding setEncoding(const char* encoding)
{
if (encoding) {
if (strcasecmp(encoding,"ISO-8859-1")) {
return pugi::encoding_latin1;
}
if (strcasecmp(encoding, "UTF-8")) {
return pugi::encoding_utf8;
}
if (strcasecmp(encoding, "UTF-16"))
return pugi::encoding_utf16;
}
return pugi::encoding_auto;
}
xmlDocPtr parseXml(const char * data,const char* encoding) xmlDocPtr parseXml(const char * data,const char* /*encoding*/)
{ {
pugi::xml_document* tree_parser = new pugi::xml_document(); pugi::xml_document* tree_parser = new pugi::xml_document();
if (!tree_parser->load_string(data, setEncoding(encoding))) if (!tree_parser->load_string(data))
{ {
delete tree_parser; delete tree_parser;
return NULL; return NULL;
@@ -257,8 +243,6 @@ xmlDocPtr parseXmlFile(const char * filename, bool,const char* encoding)
} }
in.close(); in.close();
} }
}else{
enc = setEncoding(encoding);
} }
pugi::xml_document* tree_parser = new pugi::xml_document(); pugi::xml_document* tree_parser = new pugi::xml_document();