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
GFS: remove member hits from bend_present_rr
[yaz-moved-to-github.git]
/
test
/
tstxmlquery.c
diff --git
a/test/tstxmlquery.c
b/test/tstxmlquery.c
index
cd8997a
..
8164d80
100644
(file)
--- a/
test/tstxmlquery.c
+++ b/
test/tstxmlquery.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: tstxmlquery.c,v 1.12 2006-07-07 12:09:05 marc Exp $
*/
#include <stdlib.h>
*/
#include <stdlib.h>
@@
-78,14
+76,14
@@
enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml,
{
WRBUF w = wrbuf_alloc();
yaz_query_to_wrbuf(w, query2);
{
WRBUF w = wrbuf_alloc();
yaz_query_to_wrbuf(w, query2);
- if (!expect_pqf || strcmp(expect_pqf, wrbuf_buf(w)) == 0)
+ if (!expect_pqf || strcmp(expect_pqf, wrbuf_cstr(w)) == 0)
status = XML_MATCH;
else
{
status = XML_NO_MATCH;
status = XML_MATCH;
else
{
status = XML_NO_MATCH;
- printf("Result: %s\n", wrbuf_buf(w));
+ printf("Result: %s\n", wrbuf_cstr(w));
}
}
- wrbuf_free(w, 1);
+ wrbuf_destroy(w);
}
odr_destroy(odr2);
}
}
odr_destroy(odr2);
}
@@
-95,6
+93,7
@@
enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml,
status = XML_NO_MATCH;
}
xmlFreeDoc(doc);
status = XML_NO_MATCH;
}
xmlFreeDoc(doc);
+ xmlFree(buf_out);
}
#else
status = QUERY2XML_FAILED;
}
#else
status = QUERY2XML_FAILED;
@@
-104,7
+103,7
@@
enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml,
return status;
}
return status;
}
-static void tst()
+static void tst(void)
{
YAZ_CHECK_EQ(pqf2xml_text("@attr 1=4 bad query", "", 0), PQF_FAILED);
#if YAZ_HAVE_XML2
{
YAZ_CHECK_EQ(pqf2xml_text("@attr 1=4 bad query", "", 0), PQF_FAILED);
#if YAZ_HAVE_XML2
@@
-242,6
+241,7
@@
int main (int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab