X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_tagset.c;h=65311dd45974f955e992f14734c28849ce713767;hb=ec29e37cd269b330eb493157dedf9aacf5c6ca46;hp=00b09ad123ed1d5f33ce09935d0979e32404c29b;hpb=6517fa53d35512887780fd07de5667940da18a9e;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_tagset.c b/retrieval/d1_tagset.c
index 00b09ad..65311dd 100644
--- a/retrieval/d1_tagset.c
+++ b/retrieval/d1_tagset.c
@@ -4,7 +4,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_tagset.c,v $
- * Revision 1.6  1997-09-17 12:10:38  adam
+ * Revision 1.8  1998-05-18 13:07:07  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.
+ *
+ * Revision 1.7  1998/02/11 11:53:35  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6  1997/09/17 12:10:38  adam
  * YAZ version 1.4.
  *
  * Revision 1.5  1997/09/05 09:50:57  adam
@@ -58,7 +66,7 @@ data1_datatype data1_maptype (data1_handle dh, char *t)
 	{"int", DATA1K_int},
 	{"octetstring", DATA1K_octetstring},
 	{"null", DATA1K_null},
-	{0, -1}
+	{NULL, (data1_datatype) -1}
     };
     int i;
 
@@ -124,7 +132,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
 	return 0;
     }
 
-    res = nmem_malloc(mem, sizeof(*res));
+    res = (data1_tagset *)nmem_malloc(mem, sizeof(*res));
     res->name = 0;
     res->type = 0;
     res->tags = 0;
@@ -163,7 +171,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
 		fclose(f);
 		return 0;
 	    }
-	    rr = *tagp = nmem_malloc(mem, sizeof(*rr));
+	    rr = *tagp = (data1_tag *)nmem_malloc(mem, sizeof(*rr));
 	    rr->tagset = res;
 	    rr->next = 0;
 	    rr->which = DATA1T_numeric;
@@ -186,7 +194,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
 	    {
 		char *e;
 
-		*npp = nmem_malloc(mem, sizeof(**npp));
+		*npp = (data1_name *)nmem_malloc(mem, sizeof(**npp));
 		if ((e = strchr(nm, '/')))
 		    *(e++) = '\0';
 		(*npp)->name = nmem_strdup(mem, nm);