diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-12-06 18:41:48 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-12-06 18:41:48 +0100 |
| commit | 3acdf25b058bceef3005eead6e909c27c7a9e4a8 (patch) | |
| tree | 38c40774061bd44b3452091092a018c53459907b /src/XMLParser.h | |
| parent | Tools: Removed unused Timer.* file from CMakeLists.txt. (diff) | |
| parent | Merge pull request #1647 from mc-server/SocketThreadsFix (diff) | |
| download | cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.gz cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.bz2 cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.lz cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.xz cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.zst cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.zip | |
Diffstat (limited to 'src/XMLParser.h')
| -rw-r--r-- | src/XMLParser.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/XMLParser.h b/src/XMLParser.h index 5b53e55cf..ea341bce6 100644 --- a/src/XMLParser.h +++ b/src/XMLParser.h @@ -105,11 +105,11 @@ public: Destroy (); // If the encoding or seperator are empty, then nullptr - if (pszEncoding != nullptr && pszEncoding [0] == 0) + if ((pszEncoding != nullptr) && (pszEncoding[0] == 0)) { pszEncoding = nullptr; } - if (pszSep != nullptr && pszSep [0] == 0) + if ((pszSep != nullptr) && (pszSep[0] == 0)) { pszSep = nullptr; } @@ -147,7 +147,7 @@ public: bool Parse (const char *pszBuffer, int nLength, bool fIsFinal = true) { assert (m_p != nullptr); - return XML_Parse (m_p, pszBuffer, nLength, fIsFinal) != 0; + return (XML_Parse (m_p, pszBuffer, nLength, fIsFinal) != 0); } // @cmember Parse internal buffer @@ -254,7 +254,9 @@ protected: XML_SetDefaultHandlerExpand (m_p, fEnable ? DefaultHandler : nullptr); } else + { XML_SetDefaultHandler (m_p, fEnable ? DefaultHandler : nullptr); + } } // @cmember Enable/Disable external entity ref handler @@ -402,11 +404,17 @@ public: { XML_expat_version v = XML_ExpatVersionInfo (); if (pnMajor) + { *pnMajor = v .major; + } if (pnMinor) + { *pnMinor = v .minor; + } if (pnMicro) + { *pnMicro = v .micro; + } } // @cmember Get last error string |