X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fyaz-xmlquery.c;h=39000fc1d46857333a49d16c39776be810565907;hp=66121834481210b273ce4db31a39ea9336b3a1c6;hb=4f8ea8cfaf2f3d95e4efcf9494526c2b4be43eb8;hpb=f403b05509aac2b9da65ecb9397d9452bd3a3aab

diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c
index 6612183..39000fc 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.1 2006-02-23 10:40:59 adam Exp $
+ * $Id: yaz-xmlquery.c,v 1.6 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdlib.h>
@@ -14,13 +14,13 @@
 #include <yaz/pquery.h>
 #include <yaz/test.h>
 
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 #include <libxml/parser.h>
 #endif
 
 static char *prog = "yaz-xmlquery";
 
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 void pqftoxmlquery(const char *pqf)
 {
     YAZ_PQF_Parser parser = yaz_pqf_create();
@@ -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)
 	    {
@@ -143,7 +143,8 @@ void xmlfiletopqf(const char *xmlfile)
 	exit(1);
     }
     rewind(f);
-    xmlstr = xmalloc(sz);
+    xmlstr = xmalloc(sz+1);
+    xmlstr[sz] = '\0';
     fread(xmlstr, sz, 1, f);
     fclose(f);
     
@@ -152,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");
@@ -162,7 +163,7 @@ void usage()
 
 int main (int argc, char **argv)
 {
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
     char *arg;
     int r;
     int active = 0;