griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Added correct XML String conversion - was leaking memory, and added logging for Warnings

Browse Source 
This was SVN commit r446.
This commit is contained in:
Simon Brenner 2004-06-09 14:01:09 +00:00
parent 4efc41cb30
commit b520430cb5
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/ps/XercesErrorHandler.cpp
View File

@ -10,7 +10,6 @@ gee@pyro.nu
#include "precompiled.h"
//#include <xercesc/sax/SAXParseException.hpp>
#include "XercesErrorHandler.h"
#include <iostream>
#include <stdlib.h>
@ -21,53 +20,42 @@ gee@pyro.nu
// Use namespace
XERCES_CPP_NAMESPACE_USE
void CXercesErrorHandler::warning(const SAXParseException&)
void CXercesErrorHandler::warning(const SAXParseException &toCatch)
{
//
// Ignore all warnings.
//
CStr systemId=XMLTranscode(toCatch.getSystemId());
CStr message=XMLTranscode(toCatch.getMessage());
LOG(WARNING, "XML Parse Warning: %s:%d:%d: %s",
systemId.c_str(),
toCatch.getLineNumber(),
toCatch.getColumnNumber(),
message.c_str());
}
void CXercesErrorHandler::error(const SAXParseException& toCatch)
{
char * buf = XMLString::transcode(toCatch.getMessage());
CStr systemId=XMLTranscode(toCatch.getSystemId());
CStr message=XMLTranscode(toCatch.getMessage());
fSawErrors = true;
XMLString::release(&buf);
/* cerr << "Error at file \"" << StrX(toCatch.getSystemId())
<< "\", line " << toCatch.getLineNumber()
<< ", column " << toCatch.getColumnNumber()
<< "\n Message: " << StrX(toCatch.getMessage()) << endl;
*/
LOG(ERROR, "XML Parse Error: %s:%d:%d: %s",
XMLString::transcode(toCatch.getSystemId()),
systemId.c_str(),
toCatch.getLineNumber(),
toCatch.getColumnNumber(),
XMLString::transcode(toCatch.getMessage()));
/// g_nemLog(" Error: %s", XMLString::transcode(toCatch.getMessage()));
message.c_str());
}
void CXercesErrorHandler::fatalError(const SAXParseException& toCatch)
{
char * buf = XMLString::transcode(toCatch.getMessage());
CStr systemId=XMLTranscode(toCatch.getSystemId());
CStr message=XMLTranscode(toCatch.getMessage());
fSawErrors = true;
XMLString::release(&buf);
/* cerr << "Fatal Error at file \"" << StrX(toCatch.getSystemId())
<< "\", line " << toCatch.getLineNumber()
<< ", column " << toCatch.getColumnNumber()
<< "\n Message: " << StrX(toCatch.getMessage()) << endl;
*/
LOG(ERROR, "XML Parse Error: %s:%d:%d: %s",
XMLString::transcode(toCatch.getSystemId()),
LOG(ERROR, "XML Parse Error (Fatal): %s:%d:%d: %s",
systemId.c_str(),
toCatch.getLineNumber(),
toCatch.getColumnNumber(),
XMLString::transcode(toCatch.getMessage()));
/// g_nemLog(" Error: %s", XMLString::transcode(toCatch.getMessage()));
message.c_str());
}
void CXercesErrorHandler::resetErrors()