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
This commit is contained in:
Ivo Hinkelmann
2007-04-17 09:22:44 +00:00
parent 4c70e065df
commit d952b1a80b

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: errorcallback.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * 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, extern "C"
const char *func, void errorCallback(const char * /*file*/,
const char *errorObject, int /*line*/,
const char *errorSubject, const char * /*func*/,
int reason, const char * /*errorObject*/,
const char *msg) const char * /*errorSubject*/,
int /*reason*/,
const char * /*msg*/)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
const char * afunc = func ? func : ""; // const char * afunc = func ? func : "";
const char * errObj = errorObject ? errorObject : ""; // const char * errObj = errorObject ? errorObject : "";
const char * errSub = errorSubject ? errorSubject : ""; // const char * errSub = errorSubject ? errorSubject : "";
const char * amsg = msg ? msg : ""; // const char * amsg = msg ? msg : "";
fprintf(stdout, "xmlsec error: %s, %s, %s, %i %s \n", afunc, errObj, errSub, reason, amsg); // fprintf(stdout, "xmlsec error: %s, %s, %s, %i %s \n", afunc, errObj, errSub, reason, amsg);
#endif #endif
//ToDo write log message //ToDo write log message
// if (g_xErrorRecorder.is() && !g_bErrorRecorded) // if (g_xErrorRecorder.is() && !g_bErrorRecorded)