X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fyaz-xmlquery.c;h=c4c9a4dba884784df1141f3479ad55856cad30df;hb=8cb2e2a9699826bbc9a09d9eea1723cec3cd418c;hp=b2dc5880a1723a4a3526bbf8de01350255a64aa9;hpb=fc6d778b923000b5c6ad8e108b0b184178a9d33f;p=yaz-moved-to-github.git

diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c
index b2dc588..c4c9a4d 100644
--- 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.9 2007-05-06 20:12:20 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);
@@ -143,7 +143,7 @@ void xmlfiletopqf(const char *xmlfile)
 	exit(1);
     }
     rewind(f);
-    xmlstr = xmalloc(sz+1);
+    xmlstr = (char *) xmalloc(sz+1);
     xmlstr[sz] = '\0';
     fread(xmlstr, sz, 1, f);
     fclose(f);
@@ -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");