From 7f23ee90fd545995a29e2175f15e8b97e59ca67a Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:13:13 +0200 Subject: 3.20 --- library/process_xml.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'library/process_xml.cpp') diff --git a/library/process_xml.cpp b/library/process_xml.cpp index 69dad7f3..276bc977 100644 --- a/library/process_xml.cpp +++ b/library/process_xml.cpp @@ -3,9 +3,9 @@ // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de) * // ************************************************************************** -// + #include "process_xml.h" -#include +#include #include "../shared/i18n.h" #include "../shared/global_func.h" #include "../shared/standard_paths.h" @@ -42,10 +42,10 @@ XmlType xmlAccess::getXmlType(const wxString& filename) //throw() XmlDoc doc; try { - std::string stream = loadStream(filename); //throw XmlFileError - parse(stream, doc); //throw XmlParsingError + //do NOT use zen::loadStream as it will superfluously load even huge files! + loadXmlDocument(filename, doc); //throw FfsXmlError, quick exit if file is not an FFS XML } - catch (const zen::XmlError&) //catch XmlFileError, XmlParsingError + catch (const FfsXmlError&) { return XML_TYPE_OTHER; } -- cgit