1 files changed, 85 insertions, 82 deletions
diff --git a/cpp/src/Ice/SslConfigErrorReporter.cpp b/cpp/src/Ice/SslConfigErrorReporter.cpp
index 247db4f50d5..bd466b4a611 100644
--- a/cpp/src/Ice/SslConfigErrorReporter.cpp
+++ b/cpp/src/Ice/SslConfigErrorReporter.cpp
@@ -1,82 +1,85 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#include <iostream>
-#include <sstream>
-
-#include <sax/SAXParseException.hpp>
-#include <Ice/SslConfigErrorReporter.h>
-#include <stdlib.h>
-#include <string.h>
-#include <Ice/Security.h>
-
-using namespace std;
-
-void
-IceSecurity::Ssl::ErrorReporter::warning(const SAXParseException& toCatch)
-{
-    if (_traceLevels->security >= SECURITY_PARSE_WARNINGS)
-    {
-	ostringstream s;
-
-        s << "Xerces-c Init Exception: "<< "Warning at file \""
-          << DOMString(toCatch.getSystemId())
-          << "\", line " << toCatch.getLineNumber()
-          << ", column " << toCatch.getColumnNumber()
-          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
-
-        _logger->trace(_traceLevels->securityCat, s.str());
-    }
-}
-
-void
-IceSecurity::Ssl::ErrorReporter::error(const SAXParseException& toCatch)
-{
-    _sawErrors = true;
-
-    if (_traceLevels->security >= SECURITY_PARSE_WARNINGS)
-    {
-	ostringstream s;
-
-        s << "Xerces-c Init Exception: "<< "Error at file \""
-          << DOMString(toCatch.getSystemId())
-          << "\", line " << toCatch.getLineNumber()
-          << ", column " << toCatch.getColumnNumber()
-          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
-
-        _logger->trace(_traceLevels->securityCat, s.str());
-    }
-}
-
-void
-IceSecurity::Ssl::ErrorReporter::fatalError(const SAXParseException& toCatch)
-{
-    _sawErrors = true;
-
-    if (_traceLevels->security >= SECURITY_PARSE_WARNINGS)
-    {
-	ostringstream s;
-
-        s << "Xerces-c Init Exception: "<< "Fatal error at file \""
-          << DOMString(toCatch.getSystemId())
-          << "\", line " << toCatch.getLineNumber()
-          << ", column " << toCatch.getColumnNumber()
-          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
-
-        _logger->trace(_traceLevels->securityCat, s.str());
-    }
-}
-
-void
-IceSecurity::Ssl::ErrorReporter::resetErrors()
-{
-    // No-op in this case
-}
-
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <iostream>
+#include <sstream>
+
+#include <sax/SAXParseException.hpp>
+#include <Ice/SslConfigErrorReporter.h>
+#include <stdlib.h>
+#include <string.h>
+#include <Ice/Security.h>
+
+using namespace std;
+
+void
+IceSecurity::Ssl::ErrorReporter::warning(const SAXParseException& toCatch)
+{
+    if (ICE_SECURITY_LEVEL_PARSEWARNINGS)
+    {
+	ostringstream s;
+
+        s << "SSL configuration file parse warning.\n"
+          << "Xerces-c Init Exception: "<< "Warning at file \""
+          << DOMString(toCatch.getSystemId())
+          << "\", line " << toCatch.getLineNumber()
+          << ", column " << toCatch.getColumnNumber()
+          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
+
+        ICE_PARSE_WARNING(s.str());
+    }
+}
+
+void
+IceSecurity::Ssl::ErrorReporter::error(const SAXParseException& toCatch)
+{
+    _sawErrors = true;
+
+    if (ICE_SECURITY_LEVEL_PARSEWARNINGS)
+    {
+	ostringstream s;
+
+        s << "SSL configuration file parse error.\n"
+          << "Xerces-c Init Exception: "<< "Error at file \""
+          << DOMString(toCatch.getSystemId())
+          << "\", line " << toCatch.getLineNumber()
+          << ", column " << toCatch.getColumnNumber()
+          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
+
+        ICE_PARSE_WARNING(s.str());
+    }
+}
+
+void
+IceSecurity::Ssl::ErrorReporter::fatalError(const SAXParseException& toCatch)
+{
+    _sawErrors = true;
+
+    if (ICE_SECURITY_LEVEL_PARSEWARNINGS)
+    {
+	ostringstream s;
+
+        s << "SSL configuration file parse error.\n"
+          << "Xerces-c Init Exception: "<< "Fatal error at file \""
+          << DOMString(toCatch.getSystemId())
+          << "\", line " << toCatch.getLineNumber()
+          << ", column " << toCatch.getColumnNumber()
+          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
+
+        ICE_PARSE_WARNING(s.str());
+    }
+}
+
+void
+IceSecurity::Ssl::ErrorReporter::resetErrors()
+{
+    // No-op in this case
+}
+