From d1e1a6a2a574e8019e700abb9d8a9d03ba41aab5 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 6 Jul 2006 11:40:23 +0000
Subject: [PATCH] Remove destroy member of data1_node

---
 data1/d1_doespec.c      |    3 +--
 data1/d1_map.c          |    3 +--
 data1/d1_read.c         |   18 +-----------------
 include/idzebra/data1.h |    4 +---
 index/recgrs.c          |   11 +----------
 5 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c
index 9b56b07..d7989b3 100644
--- a/data1/d1_doespec.c
+++ b/data1/d1_doespec.c
@@ -1,4 +1,4 @@
-/* $Id: d1_doespec.c,v 1.9 2006-05-10 08:13:18 adam Exp $
+/* $Id: d1_doespec.c,v 1.10 2006-07-06 11:40:23 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -138,7 +138,6 @@ static void match_triple (data1_handle dh, Z_Variant *vreq,
 	}
 	if (remove_flag)
 	{
-	    data1_free_tree (dh, *c);
 	    *c = (*c)->next;
 	}
 	else
diff --git a/data1/d1_map.c b/data1/d1_map.c
index 72ef930..78ca215 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,4 +1,4 @@
-/* $Id: d1_map.c,v 1.11 2006-06-13 12:02:02 adam Exp $
+/* $Id: d1_map.c,v 1.12 2006-07-06 11:40:23 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -344,7 +344,6 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
 
     if (map_children(dh, n, map, res1, m) < 0)
     {
-	data1_free_tree(dh, res);
 	return 0;
     }
     return res;
diff --git a/data1/d1_read.c b/data1/d1_read.c
index c9d92b6..1c50d06 100644
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,4 +1,4 @@
-/* $Id: d1_read.c,v 1.19 2006-06-13 12:02:02 adam Exp $
+/* $Id: d1_read.c,v 1.20 2006-07-06 11:40:23 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -125,7 +125,6 @@ data1_node *data1_append_node (data1_handle dh, NMEM m, int type,
 {
     data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
     r->next = r->child = r->last_child = 0;
-    r->destroy = 0;
 
     r->parent = parent;
     if (!parent)
@@ -154,7 +153,6 @@ data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
 {
     data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
     r->next = r->child = r->last_child = 0;
-    r->destroy = 0;
     
     if (!parent)
         r->root = r;
@@ -172,20 +170,6 @@ data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
     return r;
 }
 
-void data1_free_tree (data1_handle dh, data1_node *t)
-{
-    data1_node *p = t->child, *pn;
-
-    while (p)
-    {
-	pn = p->next;
-	data1_free_tree (dh, p);
-	p = pn;
-    }
-    if (t->destroy)
-	(*t->destroy)(t);
-}
-
 data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 {
     data1_absyn *absyn = data1_get_absyn(dh, name, 1);
diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index 3f93112..b09f3a1 100644
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,4 +1,4 @@
-/* $Id: data1.h,v 1.15 2006-06-13 12:02:03 adam Exp $
+/* $Id: data1.h,v 1.16 2006-07-06 11:40:24 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -344,7 +344,6 @@ typedef struct data1_node
         } preprocess;
     } u;
 
-    void (*destroy)(struct data1_node *n);
 #define DATA1_LOCALDATA 12
     char lbuf[DATA1_LOCALDATA]; /* small buffer for local data */
     struct data1_node *next;
@@ -388,7 +387,6 @@ YAZ_EXPORT Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
 					   int *len);
 YAZ_EXPORT data1_tag *data1_gettagbyname(data1_handle dh, data1_tagset *s,
 					 const char *name);
-YAZ_EXPORT void data1_free_tree(data1_handle dh, data1_node *t);
 YAZ_EXPORT char *data1_nodetobuf(data1_handle dh, data1_node *n,
 				 int select, int *len);
 YAZ_EXPORT data1_node *data1_mk_tag_data_wd(data1_handle dh,
diff --git a/index/recgrs.c b/index/recgrs.c
index 7adf160..cd11eda 100644
--- a/index/recgrs.c
+++ b/index/recgrs.c
@@ -1,4 +1,4 @@
-/* $Id: recgrs.c,v 1.1 2006-07-03 14:27:09 adam Exp $
+/* $Id: recgrs.c,v 1.2 2006-07-06 11:40:25 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -987,10 +987,8 @@ static int grs_extract_sub(void *clientData, struct recExtractCtrl *p,
     (*p->init)(p, &wrd);
     if (dumpkeys(n, p, &wrd) < 0)
     {
-	data1_free_tree(p->dh, n);
 	return RECCTRL_EXTRACT_ERROR_GENERIC;
     }
-    data1_free_tree(p->dh, n);
     return RECCTRL_EXTRACT_OK;
 }
 
@@ -1313,9 +1311,6 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 				       p->odr)) > 0)
     {
 	p->diagnostic = res;
-	if (onode)
-	    data1_free_tree(p->dh, onode);
-	data1_free_tree(p->dh, node);
 	nmem_destroy(mem);
 	return 0;
     }
@@ -1432,10 +1427,6 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 		p->rec_buf = new_buf;
 	}
     }
-    if (node)
-	data1_free_tree(p->dh, node);
-    if (onode)
-	data1_free_tree(p->dh, onode);
     nmem_destroy(mem);
     return 0;
 }
-- 
1.7.10.4