projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore more
[idzebra-moved-to-github.git]
/
data1
/
d1_read.c
diff --git
a/data1/d1_read.c
b/data1/d1_read.c
index
91bea6c
..
1c50d06
100644
(file)
--- a/
data1/d1_read.c
+++ b/
data1/d1_read.c
@@
-1,4
+1,4
@@
-/* $Id: d1_read.c,v 1.17 2005-04-28 08:12:28 adam Exp $
+/* $Id: d1_read.c,v 1.20 2006-07-06 11:40:23 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
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;
{
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)
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;
{
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;
if (!parent)
r->root = r;
@@
-172,23
+170,9
@@
data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
return r;
}
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_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
{
- data1_absyn *absyn = data1_get_absyn (dh, name);
+ data1_absyn *absyn = data1_get_absyn(dh, name, 1);
data1_node *res;
if (!absyn)
{
data1_node *res;
if (!absyn)
{
@@
-205,7
+189,8
@@
data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
void data1_set_root(data1_handle dh, data1_node *res,
NMEM nmem, const char *name)
{
void data1_set_root(data1_handle dh, data1_node *res,
NMEM nmem, const char *name)
{
- data1_absyn *absyn = data1_get_absyn (dh, name);
+ data1_absyn *absyn = data1_get_absyn(
+ dh, name, DATA1_XPATH_INDEXING_ENABLE);
res->u.root.type = data1_insert_string (dh, res, nmem, name);
res->u.root.absyn = absyn;
res->u.root.type = data1_insert_string (dh, res, nmem, name);
res->u.root.absyn = absyn;
@@
-1178,3
+1163,11
@@
void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
data1_concat_text(dh, m, n->child);
}
}
data1_concat_text(dh, m, n->child);
}
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+