From 087292f5a39e52a8f65cda0b9c035dbd63f1fe9c Mon Sep 17 00:00:00 2001
From: David Abram Cargill <cargilld@apache.org>
Date: Fri, 17 Mar 2006 21:34:37 +0000
Subject: [PATCH] Display actual errorCode when reporting an error.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@386727 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/internal/WFXMLScanner.cpp | 6 ++++++
src/xercesc/internal/XMLScanner.cpp | 21 +++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/src/xercesc/internal/WFXMLScanner.cpp b/src/xercesc/internal/WFXMLScanner.cpp
index 6303f1247..3980c928f 100644
--- a/src/xercesc/internal/WFXMLScanner.cpp
+++ b/src/xercesc/internal/WFXMLScanner.cpp
@@ -198,6 +198,7 @@ void WFXMLScanner::scanDocument(const InputSource& src)
emitError
(
XMLErrs::XMLException_Warning
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -205,6 +206,7 @@ void WFXMLScanner::scanDocument(const InputSource& src)
emitError
(
XMLErrs::XMLException_Fatal
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -212,6 +214,7 @@ void WFXMLScanner::scanDocument(const InputSource& src)
emitError
(
XMLErrs::XMLException_Error
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -366,6 +369,7 @@ bool WFXMLScanner::scanNext(XMLPScanToken& token)
emitError
(
XMLErrs::XMLException_Warning
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -373,6 +377,7 @@ bool WFXMLScanner::scanNext(XMLPScanToken& token)
emitError
(
XMLErrs::XMLException_Fatal
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -380,6 +385,7 @@ bool WFXMLScanner::scanNext(XMLPScanToken& token)
emitError
(
XMLErrs::XMLException_Error
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
diff --git a/src/xercesc/internal/XMLScanner.cpp b/src/xercesc/internal/XMLScanner.cpp
index 23f1d4599..6a6ac4474 100644
--- a/src/xercesc/internal/XMLScanner.cpp
+++ b/src/xercesc/internal/XMLScanner.cpp
@@ -378,6 +378,7 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -392,6 +393,7 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -413,6 +415,7 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -429,6 +432,7 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
emitError
(
XMLErrs::XMLException_Warning
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -436,6 +440,7 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
emitError
(
XMLErrs::XMLException_Fatal
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -443,6 +448,7 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
emitError
(
XMLErrs::XMLException_Error
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -491,6 +497,7 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -505,6 +512,7 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -525,6 +533,7 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -541,6 +550,7 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Warning
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -548,6 +558,7 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -555,6 +566,7 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Error
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -632,6 +644,7 @@ bool XMLScanner::scanFirst( const InputSource& src
emitError
(
XMLErrs::XMLException_Warning
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -639,6 +652,7 @@ bool XMLScanner::scanFirst( const InputSource& src
emitError
(
XMLErrs::XMLException_Fatal
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -646,6 +660,7 @@ bool XMLScanner::scanFirst( const InputSource& src
emitError
(
XMLErrs::XMLException_Error
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -1743,6 +1758,7 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -1757,6 +1773,7 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -1778,6 +1795,7 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , e.getCode()
, e.getType()
, e.getMessage()
);
@@ -1794,6 +1812,7 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Warning
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -1801,6 +1820,7 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Fatal
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
@@ -1808,6 +1828,7 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
emitError
(
XMLErrs::XMLException_Error
+ , excToCatch.getCode()
, excToCatch.getType()
, excToCatch.getMessage()
);
--
GitLab