projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed global data1_tabpath - uses data1_get_tabpath() instead.
[yaz-moved-to-github.git]
/
retrieval
/
d1_read.c
diff --git
a/retrieval/d1_read.c
b/retrieval/d1_read.c
index
a430565
..
d4a14bd
100644
(file)
--- a/
retrieval/d1_read.c
+++ b/
retrieval/d1_read.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
- * Revision 1.13 1996-10-29 13:35:38 adam
+ * Revision 1.15 1997-09-05 09:50:57 adam
+ * Removed global data1_tabpath - uses data1_get_tabpath() instead.
+ *
+ * Revision 1.14 1997/05/14 06:54:04 adam
+ * C++ support.
+ *
+ * Revision 1.13 1996/10/29 13:35:38 adam
* Implemented data1_set_tabpath and data1_get_tabpath.
*
* Revision 1.12 1996/10/11 10:35:38 adam
* Implemented data1_set_tabpath and data1_get_tabpath.
*
* Revision 1.12 1996/10/11 10:35:38 adam
@@
-98,7
+104,7
@@
#include <log.h>
#include <data1.h>
#include <log.h>
#include <data1.h>
-char *data1_tabpath = 0; /* global path for tables */
+static char *data1_tabpath = 0; /* global path for tables */
void data1_set_tabpath(const char *p)
{
void data1_set_tabpath(const char *p)
{
@@
-119,9
+125,6
@@
const char *data1_get_tabpath (void)
return data1_tabpath;
}
return data1_tabpath;
}
-#if 0
-static data1_node *freelist = 0;
-#endif
/*
* get the tag which is the immediate parent of this node (this may mean
/*
* get the tag which is the immediate parent of this node (this may mean
@@
-139,29
+142,13
@@
data1_node *data1_mk_node(NMEM m)
{
data1_node *r;
{
data1_node *r;
-#if 0
- if ((r = freelist))
- freelist = r->next;
- else
- if (!(r = xmalloc(sizeof(*r))))
- abort();
-#else
r = nmem_malloc(m, sizeof(*r));
r = nmem_malloc(m, sizeof(*r));
-#endif
r->next = r->child = r->last_child = r->parent = 0;
r->num_children = 0;
r->destroy = 0;
return r;
}
r->next = r->child = r->last_child = r->parent = 0;
r->num_children = 0;
r->destroy = 0;
return r;
}
-#if 0
-static void fr_node(data1_node *n)
-{
- n->next = freelist;
- freelist = n;
-}
-#endif
-
void data1_free_tree(data1_node *t)
{
data1_node *p = t->child, *pn;
void data1_free_tree(data1_node *t)
{
data1_node *p = t->child, *pn;
@@
-174,9
+161,6
@@
void data1_free_tree(data1_node *t)
}
if (t->destroy)
(*t->destroy)(t);
}
if (t->destroy)
(*t->destroy)(t);
-#if 0
- fr_node(t);
-#endif
}
/*
}
/*
@@
-302,18
+286,18
@@
data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
}
else if (!strncmp(tag, "var", 3))
{
}
else if (!strncmp(tag, "var", 3))
{
- char class[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
+ char tclass[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
data1_vartype *tp;
int val_offset;
data1_node *p;
data1_vartype *tp;
int val_offset;
data1_node *p;
- if (sscanf(args, "%s %s %n", class, type, &val_offset) != 2)
+ if (sscanf(args, "%s %s %n", tclass, type, &val_offset) != 2)
{
logf(LOG_WARN, "Malformed variant triple at '%s'", tag);
return 0;
}
if (!(tp = data1_getvartypebyct(parent->root->u.root.absyn->varset,
{
logf(LOG_WARN, "Malformed variant triple at '%s'", tag);
return 0;
}
if (!(tp = data1_getvartypebyct(parent->root->u.root.absyn->varset,
- class, type)))
+ tclass, type)))
return 0;
/*
return 0;
/*
@@
-410,9
+394,6
@@
data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
{
int len = 0;
char *data = *buf, *pp = *buf;
{
int len = 0;
char *data = *buf, *pp = *buf;
-#if 0
- data1_node *partag = get_parent_tag(parent);
-#endif
if (!parent) /* abort if abstract syntax is undefined */
return 0;
if (!parent) /* abort if abstract syntax is undefined */
return 0;