X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr.c;h=e172eda7c464fbed629f5ad2c7ba7ba4c73bdd50;hp=732f2589ba4bc76a9a13f6909a407d75310557c8;hb=59526fbbf2e3b54ce94b3e79e6c7fef9e4f456fb;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4 diff --git a/odr/odr.c b/odr/odr.c index 732f258..e172eda 100644 --- a/odr/odr.c +++ b/odr/odr.c @@ -1,10 +1,71 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2001, Index Data * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * $Log: odr.c,v $ - * Revision 1.16 1995-09-27 15:02:57 quinn + * Revision 1.34 2001-02-21 13:46:53 adam + * C++ fixes. + * + * Revision 1.33 2000/02/29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.32 2000/01/31 13:15:21 adam + * Removed uses of assert(3). Cleanup of ODR. CCL parser update so + * that some characters are not surrounded by spaces in resulting term. + * ILL-code updates. + * + * Revision 1.31 1999/11/30 13:47:11 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.30 1999/08/27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.29 1999/04/27 08:34:10 adam + * Modified odr_destroy so that file is not closed when file is 0. + * + * Revision 1.28 1998/07/20 12:38:13 adam + * More LOG_DEBUG-diagnostics. + * + * Revision 1.27 1998/02/11 11:53:34 adam + * Changed code so that it compiles as C++. + * + * Revision 1.26 1997/11/24 11:33:56 adam + * Using function odr_nullval() instead of global ODR_NULLVAL when + * appropriate. + * + * Revision 1.25 1997/10/31 12:20:08 adam + * Improved memory debugging for xmalloc/nmem.c. References to NMEM + * instead of ODR in n ESPEC-1 handling in source d1_espec.c. + * Bug fix: missing fclose in data1_read_espec1. + * + * Revision 1.24 1997/09/01 08:51:07 adam + * New windows NT/95 port using MSV5.0. Had to avoid a few static + * variables used in function ber_tag. These are now part of the + * ODR structure. + * + * Revision 1.23 1997/04/30 08:52:10 quinn + * Null + * + * Revision 1.22 1996/10/08 12:58:17 adam + * New ODR function, odr_choice_enable_bias, to control behaviour of + * odr_choice_bias. + * + * Revision 1.21 1996/07/26 13:38:19 quinn + * Various smaller things. Gathered header-files. + * + * Revision 1.20 1995/11/08 17:41:32 quinn + * Smallish. + * + * Revision 1.19 1995/11/01 13:54:41 quinn + * Minor adjustments + * + * Revision 1.18 1995/09/29 17:12:22 quinn + * Smallish + * + * Revision 1.17 1995/09/29 17:01:50 quinn + * More Windows work + * + * Revision 1.16 1995/09/27 15:02:57 quinn * Modified function heads & prototypes. * * Revision 1.15 1995/08/15 12:00:22 quinn @@ -55,14 +116,22 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include -#include -#include +#include +#include + +Odr_null *ODR_NULLVAL = (Odr_null *) "NULL"; /* the presence of a null value */ -Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */ +Odr_null *odr_nullval (void) +{ + return ODR_NULLVAL; +} char *odr_errlist[] = { @@ -76,83 +145,92 @@ char *odr_errlist[] = "Protocol error", "Malformed data", "Stack overflow", - "Length of constructed type different from sum of members" + "Length of constructed type different from sum of members", + "Overflow writing definite length of constructed type" }; -void MDF odr_perror(ODR o, char *message) +char *odr_errmsg(int n) +{ + return odr_errlist[n]; +} + +void odr_perror(ODR o, char *message) { fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]); } -int MDF odr_geterror(ODR o) +int odr_geterror(ODR o) { return o->error; } -void MDF odr_setprint(ODR o, FILE *file) +void odr_setprint(ODR o, FILE *file) { o->print = file; } -ODR MDF odr_createmem(int direction) +#include + +ODR odr_createmem(int direction) { - struct odr *r; + ODR r; - if (!(r = malloc(sizeof(*r)))) - return 0; + if (!(r = (ODR)xmalloc(sizeof(*r)))) + return 0; r->direction = direction; r->print = stderr; r->buf = 0; - r->ecb.buf = 0; - r->ecb.size = r->ecb.pos = r->ecb.top = 0; - r->ecb.can_grow = 1; - r->buflen = 0; - r->mem = 0; + r->size = r->pos = r->top = 0; + r->can_grow = 1; + r->mem = nmem_create(); + r->enable_bias = 1; + r->odr_ber_tag.lclass = -1; odr_reset(r); + yaz_log (LOG_DEBUG, "odr_createmem dir=%d o=%p", direction, r); return r; } -void MDF odr_reset(ODR o) +void odr_reset(ODR o) { o->error = ONONE; o->bp = o->buf; odr_seek(o, ODR_S_SET, 0); - o->ecb.top = 0; - o->left = o->buflen; + o->top = 0; o->t_class = -1; o->t_tag = -1; o->indent = 0; o->stackp = -1; - odr_release_mem(o->mem); - o->mem = 0; + nmem_reset(o->mem); o->choice_bias = -1; + o->lenlen = 1; + yaz_log (LOG_DEBUG, "odr_reset o=%p", o); } -void MDF odr_destroy(ODR o) +void odr_destroy(ODR o) { - odr_release_mem(o->mem); - if (o->ecb.buf && o->ecb.can_grow) - free(o->ecb.buf); - if (o->print != stderr) - fclose(o->print); - free(o); + nmem_destroy(o->mem); + if (o->buf && o->can_grow) + xfree(o->buf); + if (o->print && o->print != stderr) + fclose(o->print); + xfree(o); + yaz_log (LOG_DEBUG, "odr_destroy o=%p", o); } -void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow) +void odr_setbuf(ODR o, char *buf, int len, int can_grow) { - o->buf = o->bp = (unsigned char *) buf; - o->buflen = o->left = len; + o->bp = (unsigned char *) buf; - o->ecb.buf = (unsigned char *) buf; - o->ecb.can_grow = can_grow; - o->ecb.top = o->ecb.pos = 0; - o->ecb.size = len; + o->buf = (unsigned char *) buf; + o->can_grow = can_grow; + o->top = o->pos = 0; + o->size = len; } -char MDF *odr_getbuf(ODR o, int *len, int *size) +char *odr_getbuf(ODR o, int *len, int *size) { - *len = o->ecb.top; + *len = o->top; if (size) - *size = o->ecb.size; - return (char*) o->ecb.buf; + *size = o->size; + return (char*) o->buf; }