zoomtst3: print event name

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

diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c
index 39000fc..dae8105 100644 (file)
--- a/util/yaz-xmlquery.c
+++ b/util/yaz-xmlquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, 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-xmlquery.c,v 1.6 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdlib.h>
@@ -74,7 +72,13 @@ void pqftoxmlquery(const char *pqf)
                exit(4);
            }
            else
-               fwrite(buf_out, len_out, 1, stdout);
+           {
+               if (fwrite(buf_out, len_out, 1, stdout) != 1)
+               {
+                   fprintf(stderr, "%s: write failed\n", prog);
+                   exit(5);
+               }
+           }
             xmlFreeDoc(doc);
        }
     }    
@@ -117,8 +121,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,10 +147,18 @@ 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);
+    if (fread(xmlstr, sz, 1, f) != 1)
+    {
+       fprintf(stderr, "%s: read failed for file %s\n", prog, xmlfile);
+       exit(1);
+    }
+    if (fclose(f))
+    {
+       fprintf(stderr, "%s: close failed for file %s\n", prog, xmlfile);
+       exit(1);
+    }
     
     xmlquerytopqf(xmlstr);
     xfree(xmlstr);