From d952b1a80b58d67210c5a0c535e4877a6bdbf2be Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 17 Apr 2007 09:22:44 +0000
Subject: [PATCH] INTEGRATION: CWS jl51 (1.7.30); FILE MERGED 2007/02/06
 16:38:11 jl 1.7.30.2: #i69228 warning free code 2007/02/05 13:54:21 jl
 1.7.30.1: #i69228 warning free code

---
 xmlsecurity/source/xmlsec/errorcallback.cxx | 30 +++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index c5536a6cc97b..60cf4627b494 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: errorcallback.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:42:40 $
+ *  last change: $Author: ihi $ $Date: 2007-04-17 10:22:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -154,20 +154,22 @@ using namespace ::com::sun::star::xml::crypto;
 //  }
 // }
 
-void errorCallback(const char *file,
-        int line,
-        const char *func,
-        const char *errorObject,
-        const char *errorSubject,
-        int reason,
-        const char *msg)
+
+extern "C"
+void errorCallback(const char * /*file*/,
+                   int /*line*/,
+                   const char * /*func*/,
+                   const char * /*errorObject*/,
+                   const char * /*errorSubject*/,
+                   int /*reason*/,
+                   const char  * /*msg*/)
 {
 #if OSL_DEBUG_LEVEL > 1
-    const char * afunc = func ? func : "";
-    const char * errObj = errorObject ? errorObject : "";
-    const char * errSub = errorSubject ? errorSubject : "";
-    const char * amsg = msg ? msg : "";
-    fprintf(stdout, "xmlsec error: %s, %s,  %s, %i %s  \n", afunc, errObj, errSub, reason, amsg);
+//     const char * afunc = func ? func : "";
+//     const char * errObj = errorObject ? errorObject : "";
+//     const char * errSub = errorSubject ? errorSubject : "";
+//     const char * amsg = msg ? msg : "";
+//  fprintf(stdout, "xmlsec error: %s, %s,  %s, %i %s  \n", afunc, errObj, errSub, reason, amsg);
 #endif
     //ToDo write log message
 //  if (g_xErrorRecorder.is() && !g_bErrorRecorded)