X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=17622488d1345701f9dff40b735138aaa1abe5f0;hp=ba2c6e4d07390099015edee0a6dc6be07306f8d0;hb=7826e2c92b1a07182ba5bfb94c304f1fa7d27387;hpb=1a74e6a6a7f7b81ebbda9de508b10610508b8db7 diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c index ba2c6e4..1762248 100644 --- a/retrieval/d1_read.c +++ b/retrieval/d1_read.c @@ -4,7 +4,13 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_read.c,v $ - * Revision 1.8 1995-12-15 16:20:41 quinn + * Revision 1.10 1996-01-19 15:41:47 quinn + * Fixed uninitialized boolean. + * + * Revision 1.9 1996/01/17 14:52:47 adam + * Changed prototype for reader function parsed to data1_read_record. + * + * Revision 1.8 1995/12/15 16:20:41 quinn * Added formatted text. * * Revision 1.7 1995/12/13 13:44:32 quinn @@ -172,6 +178,7 @@ data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at, datn->parent = tagn; datn->root = root; datn->which = DATA1N_data; + datn->u.data.formatted_text = 0; tagn->next = at->child; tagn->parent = at; at->child = tagn; @@ -412,7 +419,8 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, /* * Read a record in the native syntax. */ -data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd, NMEM m) +data1_node *data1_read_record(int (*rf)(void *, char *, size_t), void *fh, + NMEM m) { static char *buf = 0; char *bp; @@ -427,7 +435,7 @@ data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd, NMEM m) { if (rd + 4096 > size && !(buf =xrealloc(buf, size *= 2))) abort(); - if ((res = (*rf)(fd, buf + rd, 4096)) <= 0) + if ((res = (*rf)(fh, buf + rd, 4096)) <= 0) { if (!res) {