X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftst_retrieval.c;h=febc71de45929f5404b890bda43babb3616c1b7b;hp=3e5cd564e975808cb016edbb3cef5815173dc96c;hb=1aac63eecd76d5d060da84037a355c153d747ca7;hpb=ca44977409b92a8b1c7bfbc913a6422edc41d1d5 diff --git a/test/tst_retrieval.c b/test/tst_retrieval.c index 3e5cd56..febc71d 100644 --- a/test/tst_retrieval.c +++ b/test/tst_retrieval.c @@ -1,9 +1,6 @@ -/* - * Copyright (C) 2005-2006, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: tst_retrieval.c,v 1.8 2006-12-12 10:41:39 marc Exp $ - * */ #include #include @@ -76,12 +73,12 @@ int conv_configure_test(const char *xmlstring, const char *expect_error, if (!p) { - if (expect_error && !strcmp(wrbuf_buf(w), expect_error)) + if (expect_error && !strcmp(wrbuf_cstr(w), expect_error)) ret = 1; else { ret = 0; - printf("%.*s\n", wrbuf_len(w), wrbuf_buf(w)); + printf("%s\n", wrbuf_cstr(w)); } } else @@ -100,7 +97,7 @@ int conv_configure_test(const char *xmlstring, const char *expect_error, ret = 1; } } - wrbuf_free(w, 1); + wrbuf_destroy(w); return ret; } @@ -319,7 +316,7 @@ int main(int argc, char **argv) { YAZ_CHECK_INIT(argc, argv); - libxml2_error_to_yazlog(0 /* disable it */, ""); + yaz_log_xml_errors(0, 0 /* disable it */); #if YAZ_HAVE_XSLT tst_configure(); @@ -330,6 +327,7 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab