More wrbuf_buf woes.

[yaz-moved-to-github.git] / util / yaz-xmlquery.c

diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c
index b2dc588..4cc8196 100644 (file)
--- a/util/yaz-xmlquery.c
+++ b/util/yaz-xmlquery.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaz-xmlquery.c,v 1.3 2006-07-06 10:17:55 adam Exp $
+ * $Id: yaz-xmlquery.c,v 1.8 2007-03-19 22:17:41 adam Exp $
  */
 
 #include <stdlib.h>
@@ -62,10 +62,10 @@ void pqftoxmlquery(const char *pqf)
        }
         else
         {
-            char *buf_out = 0;
+            xmlChar *buf_out = 0;
             int len_out = 0;
 
-            xmlDocDumpMemory(doc, (xmlChar **) &buf_out, &len_out);
+            xmlDocDumpMemory(doc, &buf_out, &len_out);
 
             if (!len_out || !buf_out)
            {
@@ -117,8 +117,8 @@ void xmlquerytopqf(const char *xmlstr)
        {
            WRBUF w = wrbuf_alloc();
            yaz_query_to_wrbuf(w, query);
-           printf("%s\n", wrbuf_buf(w));
-           wrbuf_free(w, 1);
+           printf("%s\n", wrbuf_cstr(w));
+           wrbuf_destroy(w);
        }
        odr_destroy(odr);
        xmlFreeDoc(doc);
@@ -153,7 +153,7 @@ void xmlfiletopqf(const char *xmlfile)
 }
 #endif
 
-void usage()
+void usage(void)
 {
     fprintf(stderr, "%s [-p pqf] [-x xmlfile]\n", prog);
     fprintf(stderr, " -p pqf      reads pqf. write xml to stdout\n");