From bef4739853b33ca0d05ecbc169c2eec58c6c4046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 1 Mar 2014 14:09:03 +0100
Subject: [PATCH] Library: the bug in tinyxml has been fixed so the workaround
 can be removed now

---
 lib/library.cpp | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/lib/library.cpp b/lib/library.cpp
index fdd5b2acf..6634403fb 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -26,21 +26,6 @@
 #include <string>
 #include <algorithm>
 
-static tinyxml2::XMLError LoadFile(tinyxml2::XMLDocument &doc, const std::string &path)
-{
-    FILE *f = fopen(path.c_str(),"rb");
-    if (!f)
-        return tinyxml2::XML_ERROR_FILE_NOT_FOUND;
-
-    // is file ok? if "path" is a folder then reading from it will cause ferror() to return a non-zero value
-    fgetc(f);
-    int errorcode = ferror(f);
-    fclose(f);
-
-    // if file is ok, try to load it
-    return (errorcode == 0) ? doc.LoadFile(path.c_str()) : tinyxml2::XML_ERROR_FILE_NOT_FOUND;
-}
-
 Library::Library() : allocid(0)
 {
 }
@@ -62,13 +47,13 @@ bool Library::load(const char exename[], const char path[])
 
     // open file..
     tinyxml2::XMLDocument doc;
-    tinyxml2::XMLError error = LoadFile(doc,path);
+    tinyxml2::XMLError error = doc.LoadFile(path);
     if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
         // failed to open file.. is there no extension?
         std::string fullfilename(path);
         if (Path::getFilenameExtension(fullfilename) == "") {
             fullfilename += ".cfg";
-            error = LoadFile(doc,fullfilename);
+            error = doc.LoadFile(fullfilename.c_str());
         }
 
         if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
@@ -82,7 +67,7 @@ bool Library::load(const char exename[], const char path[])
 #endif
             const char *sep = (!cfgfolder.empty() && cfgfolder[cfgfolder.size()-1U]=='/' ? "" : "/");
             const std::string filename(cfgfolder + sep + fullfilename);
-            error = LoadFile(doc,filename);
+            error = doc.LoadFile(filename.c_str());
         }
     }