X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flibxml2_error.c;h=fe1f978c2faf8aaaf3fc033014bd6c8e9e780f27;hb=47db800079d3df8e8adfd93b466795d0803dabe8;hp=41d9284297ac59b47e7a9715b7896680fbbba75e;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;p=yaz-moved-to-github.git diff --git a/src/libxml2_error.c b/src/libxml2_error.c index 41d9284..fe1f978 100644 --- a/src/libxml2_error.c +++ b/src/libxml2_error.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. */ /** @@ -23,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]; @@ -35,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; @@ -53,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