From ec29e37cd269b330eb493157dedf9aacf5c6ca46 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 9 Jun 1998 13:55:06 +0000
Subject: [PATCH 1/1] Minor changes.

---
 client/client.c      |   10 +++++++---
 retrieval/d1_absyn.c |    7 +++++--
 ztest/ztest.c        |    8 ++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/client/client.c b/client/client.c
index 370348e..9189e97 100644
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.66  1998-05-18 13:06:53  adam
+ * Revision 1.67  1998-06-09 13:55:06  adam
+ * Minor changes.
+ *
+ * Revision 1.66  1998/05/18 13:06:53  adam
  * Changed the way attribute sets are handled by the retriaval module.
  * Extended Explain conversion / schema.
  * Modified server and client to work with ASN.1 compiled protocol handlers.
@@ -747,7 +750,7 @@ static int send_searchRequest(char *arg)
     Z_Query query;
     int oid[OID_SIZE];
 #if CCL2RPN
-    struct ccl_rpn_node *rpn;
+    struct ccl_rpn_node *rpn = NULL;
     int error, pos;
     oident bib1;
 #endif
@@ -826,7 +829,8 @@ static int send_searchRequest(char *arg)
 #if CCL2RPN
     case QueryType_CCL2RPN:
         query.which = Z_Query_type_1;
-        assert((RPNquery = ccl_rpn_query(out, rpn)));
+        RPNquery = ccl_rpn_query(out, rpn);
+        assert(RPNquery);
         bib1.proto = protocol;
         bib1.oclass = CLASS_ATTSET;
         bib1.value = VAL_BIB1;
diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c
index bbcf647..7813015 100644
--- a/retrieval/d1_absyn.c
+++ b/retrieval/d1_absyn.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_absyn.c,v $
- * Revision 1.20  1998-05-18 13:07:02  adam
+ * Revision 1.21  1998-06-09 13:55:07  adam
+ * Minor changes.
+ *
+ * Revision 1.20  1998/05/18 13:07:02  adam
  * Changed the way attribute sets are handled by the retriaval module.
  * Extended Explain conversion / schema.
  * Modified server and client to work with ASN.1 compiled protocol handlers.
@@ -302,7 +305,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
     data1_maptab **maptabp;
     data1_marctab **marcp;
     data1_termlist *all = 0;
-    int level;
+    int level = 0;
 
     if (!(f = yaz_path_fopen(data1_get_tabpath (dh), file, "r")))
     {
diff --git a/ztest/ztest.c b/ztest/ztest.c
index 76d846e..614df28 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,10 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.10  1998-05-27 16:55:54  adam
+ * Revision 1.11  1998-06-09 13:55:08  adam
+ * Minor changes.
+ *
+ * Revision 1.10  1998/05/27 16:55:54  adam
  * Minor changes.
  *
  * Revision 1.9  1998/03/31 11:07:45  adam
@@ -155,7 +158,8 @@ static char *dummy_database_record (int num)
 	   xfree(buf);
 	if (num == 98)
 	{
-	    assert(buf = (char*) xmalloc(2101));
+	    buf = (char*) xmalloc(2101);
+	    assert(buf);
 	    memset(buf, 'A', 2100);
 	    buf[2100] = '\0';
 	    break;
-- 
1.7.10.4