X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-ccl.c;h=4bffebebb7a42f1d28a672994c8cdd27cb00cd1c;hb=3498164f9058a807e5e25de88ecce61b97df2d14;hp=a74dd9dafff988918b10e8155eb359e22d5cc2d6;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git

diff --git a/src/yaz-ccl.c b/src/yaz-ccl.c
index a74dd9d..4bffebe 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-2010 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;
 }
@@ -51,6 +49,7 @@ Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab