projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow waitAction to be specified for ZOOM C based for Extended Services.
[yaz-moved-to-github.git]
/
src
/
libxml2_error.c
diff --git
a/src/libxml2_error.c
b/src/libxml2_error.c
index
3241a63
..
e5b5ce0
100644
(file)
--- a/
src/libxml2_error.c
+++ b/
src/libxml2_error.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (C) 2006, Index Data ApS
+ * Copyright (C) 2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: libxml2_error.c,v 1.1 2006-05-07 17:45:41 adam Exp $
+ * $Id: libxml2_error.c,v 1.4 2007-02-23 10:15:01 adam Exp $
*/
/**
* \file libxml2_error.c
*/
/**
* \file libxml2_error.c
@@
-12,13
+12,14
@@
#include <stdlib.h>
#include <stdarg.h>
#include <yaz/log.h>
#include <stdlib.h>
#include <stdarg.h>
#include <yaz/log.h>
+#include <yaz/snprintf.h>
#include <yaz/libxml2_error.h>
#include <yaz/libxml2_error.h>
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/xmlerror.h>
#endif
#include <libxml/xmlerror.h>
#endif
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
#include <libxslt/xsltutils.h>
#endif
#include <libxslt/xsltutils.h>
#endif
@@
-31,11
+32,7
@@
static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
-#ifdef WIN32
- vsprintf(buf, fmt, ap);
-#else
- vsnprintf(buf, sizeof(buf), fmt, ap);
-#endif
+ yaz_vsnprintf(buf, sizeof(buf)-1, fmt, ap);
yaz_log(libxml2_error_level, "%s: %s", (char*) ctx, buf);
va_end (ap);
yaz_log(libxml2_error_level, "%s: %s", (char*) ctx, buf);
va_end (ap);
@@
-44,10
+41,10
@@
static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
int libxml2_error_to_yazlog(int level, const char *lead_msg)
{
libxml2_error_level = level;
int libxml2_error_to_yazlog(int level, const char *lead_msg)
{
libxml2_error_level = level;
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
xsltSetGenericErrorFunc((void *) "XSLT", proxy_xml_error_handler);
#endif
xsltSetGenericErrorFunc((void *) "XSLT", proxy_xml_error_handler);
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
xmlSetGenericErrorFunc((void *) "XML", proxy_xml_error_handler);
return 0;
#else
xmlSetGenericErrorFunc((void *) "XML", proxy_xml_error_handler);
return 0;
#else