YAZ version 1.4.

[yaz-moved-to-github.git] / retrieval / d1_varset.c

diff --git a/retrieval/d1_varset.c b/retrieval/d1_varset.c
index e6ec042..ced2c26 100644 (file)
--- a/retrieval/d1_varset.c
+++ b/retrieval/d1_varset.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_varset.c,v $
- * Revision 1.5  1997-09-05 09:50:58  adam
+ * Revision 1.6  1997-09-17 12:10:39  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.5  1997/09/05 09:50:58  adam
  * Removed global data1_tabpath - uses data1_get_tabpath() instead.
  *
  * Revision 1.4  1997/05/14 06:54:04  adam
@@ -32,7 +35,8 @@
 #include <tpath.h>
 #include <data1.h>
 
-data1_vartype *data1_getvartypebyct(data1_varset *set, char *zclass, char *type)
+data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
+                                    char *zclass, char *type)
 {
     data1_varclass *c;
     data1_vartype *t;
@@ -50,9 +54,10 @@ data1_vartype *data1_getvartypebyct(data1_varset *set, char *zclass, char *type)
     return 0;
 }
 
-data1_varset *data1_read_varset(char *file)
+data1_varset *data1_read_varset (data1_handle dh, const char *file)
 {
-    data1_varset *res = xmalloc(sizeof(*res));
+    NMEM mem = data1_nmem_get (dh);
+    data1_varset *res = nmem_malloc(mem, sizeof(*res));
     data1_varclass **classp = &res->classes, *zclass = 0;
     data1_vartype **typep = 0;
     FILE *f;
@@ -63,7 +68,7 @@ data1_varset *data1_read_varset(char *file)
     res->reference = VAL_NONE;
     res->classes = 0;
 
-    if (!(f = yaz_path_fopen(data1_get_tabpath(), file, "r")))
+    if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
     {
        logf(LOG_WARN|LOG_ERRNO, "%s", file);
        return 0;
@@ -79,11 +84,10 @@ data1_varset *data1_read_varset(char *file)
                fclose(f);
                return 0;
            }
-           *classp = r = zclass = xmalloc(sizeof(*r));
+           *classp = r = zclass = nmem_malloc(mem, sizeof(*r));
            r->set = res;
            r->zclass = atoi(argv[1]);
-           r->name = xmalloc(strlen(argv[2])+1);
-           strcpy(r->name, argv[2]);
+           r->name = nmem_strdup(mem, argv[2]);
            r->types = 0;
            typep = &r->types;
            r->next = 0;
@@ -105,12 +109,11 @@ data1_varset *data1_read_varset(char *file)
                fclose(f);
                return 0;
            }
-           *typep = r = xmalloc(sizeof(*r));
-           r->name = xmalloc(strlen(argv[2])+1);
-           strcpy(r->name, argv[2]);
+           *typep = r = nmem_malloc(mem, sizeof(*r));
+           r->name = nmem_strdup(mem, argv[2]);
            r->zclass = zclass;
            r->type = atoi(argv[1]);
-           if (!(r->datatype = data1_maptype(argv[3])))
+           if (!(r->datatype = data1_maptype (dh, argv[3])))
            {
                logf(LOG_WARN, "%s: Unknown datatype '%s'", file, argv[3]);
                fclose(f);
@@ -127,8 +130,7 @@ data1_varset *data1_read_varset(char *file)
                fclose(f);
                return 0;
            }
-           res->name = xmalloc(strlen(argv[1])+1);
-           strcpy(res->name, argv[1]);
+           res->name = nmem_strdup(mem, argv[1]);
        }
        else if (!strcmp(argv[0], "reference"))
        {