X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fxml_include.c;h=3ddc570dccfa5ce434daa12a2b1ecd629c9ab704;hp=c0d2f0b26004f919295356fc939df56f2b9c570a;hb=48b7a077523d1a86c16c9f536c56d6439fe90f42;hpb=76d513fc3b7e7e267875fd965023dda71a635e1d diff --git a/src/xml_include.c b/src/xml_include.c index c0d2f0b..3ddc570 100644 --- a/src/xml_include.c +++ b/src/xml_include.c @@ -1,9 +1,9 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. */ -/** \file +/** \file \brief XML Include (not to be confused with W3C XInclude) */ #if HAVE_CONFIG_H @@ -102,7 +102,7 @@ static int config_include_src(yaz_xml_include_t config, xmlNode **np, yaz_glob_res_t glob_res; glob_ret = yaz_file_glob(wrbuf_cstr(w), &glob_res); - + if (glob_ret == 0) { size_t i; @@ -116,7 +116,7 @@ static int config_include_src(yaz_xml_include_t config, xmlNode **np, wrbuf_printf(w, " end include src=\"%s\" ", src); c = xmlNewComment((const xmlChar *) wrbuf_cstr(w)); sib = xmlAddNextSibling(sib, c); - + *np = sib; wrbuf_destroy(w); return ret; @@ -138,7 +138,7 @@ static int process_config_includes(yaz_xml_include_t config, xmlNode *n) xmlFree(src); if (ret) return ret; - + } } else @@ -156,8 +156,7 @@ int yaz_xml_include_simple(xmlNode *n, const char *base_path) struct yaz_xml_include_s s; s.confdir = base_path; - process_config_includes(&s, n); - return 0; + return process_config_includes(&s, n); } /* YAZ_HAVE_XML2 */