X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-ccl.c;h=8eef9af0d8b96227f4363333883fa834d1faeb35;hb=138fbf3c4582f2738e5b30e440994c9b6d76e194;hp=a74dd9dafff988918b10e8155eb359e22d5cc2d6;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git diff --git a/src/yaz-ccl.c b/src/yaz-ccl.c index a74dd9d..8eef9af 100644 --- a/src/yaz-ccl.c +++ b/src/yaz-ccl.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: yaz-ccl.c,v 1.4 2005-06-25 15:46:06 adam Exp $ */ /** * \file yaz-ccl.c @@ -25,9 +23,9 @@ Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p) ccl_pquery(wr, p); - q = yaz_pqf_parse(parser, o, wrbuf_buf(wr)); + q = yaz_pqf_parse(parser, o, wrbuf_cstr(wr)); - wrbuf_free(wr, 1); + wrbuf_destroy(wr); yaz_pqf_destroy(parser); return q; } @@ -41,9 +39,9 @@ Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p) ccl_pquery(wr, p); - q = yaz_pqf_scan(parser, o, &setp, wrbuf_buf(wr)); + q = yaz_pqf_scan(parser, o, &setp, wrbuf_cstr(wr)); - wrbuf_free(wr, 1); + wrbuf_destroy(wr); yaz_pqf_destroy(parser); return q; }