diff options
Diffstat (limited to 'src/errors.c')
-rw-r--r-- | src/errors.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/errors.c b/src/errors.c index 2cb0801d..2ff1f42a 100644 --- a/src/errors.c +++ b/src/errors.c @@ -114,7 +114,6 @@ xmlSecErrorsShutdown(void) { void xmlSecErrorsSetCallback(xmlSecErrorsCallback callback) { xmlSecErrorsClbk = callback; - xmlSecErrorsDefaultCallbackEnableOutput(0); } /** @@ -145,7 +144,7 @@ xmlSecErrorsDefaultCallback(const char* file, int line, const char* func, } } xmlGenericError(xmlGenericErrorContext, - "func=%s:file=%s:line=%d:obj=%s:subj=%s:error=%d:<%s>:<%s>\n", + "func=%s:file=%s:line=%d:obj=%s:subj=%s:error=%d:%s:%s\n", (func != NULL) ? func : "unknown", (file != NULL) ? file : "unknown", line, @@ -226,28 +225,13 @@ xmlSecError(const char* file, int line, const char* func, int reason, const char* msg, ...) { if(xmlSecErrorsClbk != NULL) { - xmlChar error_msg[XMLSEC_ERRORS_BUFFER_SIZE] = {'\0',}; - const char* e_msg = NULL; - xmlSecSize i; - int len = 0; - - if(xmlSecPrintErrorMessages == 0) { - if(reason != XMLSEC_ERRORS_MAX_NUMBER) { - for(i = 0; (i < XMLSEC_ERRORS_MAX_NUMBER) && (xmlSecErrorsGetMsg(i) != NULL); ++i) { - if(xmlSecErrorsGetCode(i) == reason) { - e_msg = xmlSecErrorsGetMsg(i); - snprintf(error_msg, sizeof(error_msg), "%s] [", e_msg); - len = strlen(error_msg); - break; - } - } - } - } + xmlChar error_msg[XMLSEC_ERRORS_BUFFER_SIZE]; if(msg != NULL) { va_list va; + va_start(va, msg); - xmlSecStrVPrintf(error_msg + len, sizeof(error_msg) - len, BAD_CAST msg, va); + xmlSecStrVPrintf(error_msg, sizeof(error_msg), BAD_CAST msg, va); error_msg[sizeof(error_msg) - 1] = '\0'; va_end(va); } else { |