X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=a06ecdcd45d9058b05ca1a994dd36c938318e4fa;hb=559aecba0e61eca34706023436692ba23faa29a7;hp=b38d7aa8b5c7612ef07a49e4ab95632c72504aa3;hpb=f7d86f5de3de80dcd56b7f5206d46203095eaf36;p=yaz-moved-to-github.git diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c index b38d7aa..a06ecdc 100644 --- a/retrieval/d1_absyn.c +++ b/retrieval/d1_absyn.c @@ -1,10 +1,18 @@ /* - * Copyright (c) 1995-1997, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_absyn.c,v $ - * Revision 1.16 1997-12-18 10:51:30 adam + * Revision 1.18 1998-02-27 14:08:04 adam + * Added const to some char pointer arguments. + * Reworked data1_read_node so that it doesn't create a tree with + * pointers to original "SGML"-buffer. + * + * Revision 1.17 1998/02/11 11:53:34 adam + * Changed code so that it compiles as C++. + * + * Revision 1.16 1997/12/18 10:51:30 adam * Implemented sub-trees feature for schemas - including forward * references. * @@ -100,7 +108,7 @@ data1_absyn *data1_absyn_add (data1_handle dh, const char *name) char fname[512]; NMEM mem = data1_nmem_get (dh); - data1_absyn_cache p = nmem_malloc (mem, sizeof(*p)); + data1_absyn_cache p = (data1_absyn_cache)nmem_malloc (mem, sizeof(*p)); data1_absyn_cache *pp = data1_absyn_cache_get (dh); sprintf(fname, "%s.abs", name); @@ -111,7 +119,7 @@ data1_absyn *data1_absyn_add (data1_handle dh, const char *name) return p->absyn; } -data1_absyn *data1_get_absyn (data1_handle dh, char *name) +data1_absyn *data1_get_absyn (data1_handle dh, const char *name) { data1_absyn *absyn; @@ -121,7 +129,7 @@ data1_absyn *data1_get_absyn (data1_handle dh, char *name) } data1_esetname *data1_getesetbyname(data1_handle dh, data1_absyn *a, - char *name) + const char *name) { data1_esetname *r; @@ -133,7 +141,7 @@ data1_esetname *data1_getesetbyname(data1_handle dh, data1_absyn *a, data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs, data1_element *parent, - char *tagname) + const char *tagname) { data1_element *r; @@ -154,7 +162,7 @@ data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs, } data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn, - char *name) + const char *name) { data1_element *r; assert (absyn->main_elements); @@ -208,7 +216,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) return 0; } - res = nmem_malloc(data1_nmem_get(dh), sizeof(*res)); + res = (data1_absyn *)nmem_malloc(data1_nmem_get(dh), sizeof(*res)); res->name = 0; res->reference = VAL_NONE; res->tagset = 0; @@ -247,7 +255,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (!cur_elements) { - cur_elements = nmem_malloc(data1_nmem_get(dh), + cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh), sizeof(*cur_elements)); cur_elements->next = res->sub_elements; cur_elements->elements = NULL; @@ -282,7 +290,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) } level = i; new_element = *ppl[level] = - nmem_malloc(data1_nmem_get(dh), sizeof(*new_element)); + (data1_element *)nmem_malloc(data1_nmem_get(dh), sizeof(*new_element)); new_element->next = new_element->children = 0; new_element->tag = 0; new_element->termlists = 0; @@ -321,11 +329,11 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) else if (*p) { data1_tag *nt = - new_element->tag = nmem_malloc(data1_nmem_get (dh), + new_element->tag = (data1_tag *)nmem_malloc(data1_nmem_get (dh), sizeof(*new_element->tag)); nt->which = DATA1T_string; nt->value.string = nmem_strdup(data1_nmem_get (dh), p); - nt->names = nmem_malloc(data1_nmem_get(dh), + nt->names = (data1_name *)nmem_malloc(data1_nmem_get(dh), sizeof(*new_element->tag->names)); nt->names->name = nt->value.string; nt->names->next = 0; @@ -366,7 +374,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) } if (*attname == '!') strcpy(attname, name); - *tp = nmem_malloc(data1_nmem_get(dh), sizeof(**tp)); + *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp)); (*tp)->next = 0; if (!((*tp)->att = data1_getattbyname(dh, res->attset, attname))) @@ -380,7 +388,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) (*tp)->structure = "w"; else { - (*tp)->structure = nmem_malloc (data1_nmem_get (dh), + (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh), strlen(structure)+1); strcpy ((*tp)->structure, structure); } @@ -400,7 +408,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) file, args); continue; } - cur_elements = nmem_malloc(data1_nmem_get(dh), + cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh), sizeof(*cur_elements)); cur_elements->next = res->sub_elements; cur_elements->elements = NULL; @@ -442,7 +450,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) fclose(f); return 0; } - *tp = nmem_malloc(data1_nmem_get(dh), sizeof(**tp)); + *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp)); if (!((*tp)->att = data1_getattbyname (dh, res->attset, attname))) { @@ -455,7 +463,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) (*tp)->structure = "w"; else { - (*tp)->structure = nmem_malloc (data1_nmem_get (dh), + (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh), strlen(structure)+1); strcpy ((*tp)->structure, structure); } @@ -555,7 +563,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) fclose(f); return 0; } - *esetpp = nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp)); + *esetpp = (data1_esetname *)nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp)); (*esetpp)->name = nmem_strdup(data1_nmem_get(dh), name); (*esetpp)->next = 0; if (*fname == '@')