X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flibxml2_error.c;h=fe1f978c2faf8aaaf3fc033014bd6c8e9e780f27;hb=9748d1f21b8a1c8c6f14ef9384c0e4fdb2d41585;hp=e5b5ce068a347217d57e37a73fea53e44c362114;hpb=021f5586a328c6600460aa9f9be664ba19ba20d4;p=yaz-moved-to-github.git

diff --git a/src/libxml2_error.c b/src/libxml2_error.c
index e5b5ce0..fe1f978 100644
--- a/src/libxml2_error.c
+++ b/src/libxml2_error.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: libxml2_error.c,v 1.4 2007-02-23 10:15:01 adam Exp $
  */
 /**
  * \file libxml2_error.c
@@ -25,6 +23,7 @@
 
 static int libxml2_error_level = 0;
 
+#if YAZ_HAVE_XML2
 static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
 {
     char buf[1024];
@@ -37,15 +36,16 @@ static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
 
     va_end (ap);
 }
+#endif
 
 int libxml2_error_to_yazlog(int level, const char *lead_msg)
 {
     libxml2_error_level = level;
+#if YAZ_HAVE_XML2
+    xmlSetGenericErrorFunc((void *) "XML", proxy_xml_error_handler);
 #if YAZ_HAVE_XSLT
     xsltSetGenericErrorFunc((void *) "XSLT", proxy_xml_error_handler);
 #endif
-#if YAZ_HAVE_XML2
-    xmlSetGenericErrorFunc((void *) "XML", proxy_xml_error_handler);
     return 0;
 #else
     return -1;
@@ -55,6 +55,7 @@ int libxml2_error_to_yazlog(int level, const char *lead_msg)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab