X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=6a73b624c56fecd4ea27006fc7b5aee1f45413af;hb=141269ce5f566fcd7ed188ebe9bb878bf4b32018;hp=307283cb9e42ef88aea41584bb752280911a9537;hpb=9c459af695605b44a044ad206562818be10034f1;p=yaz-moved-to-github.git diff --git a/odr/odr.c b/odr/odr.c index 307283c..6a73b62 100644 --- a/odr/odr.c +++ b/odr/odr.c @@ -1,71 +1,26 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: odr.c,v $ - * 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 - * Updated External - * - * Revision 1.14 1995/06/19 12:38:46 quinn - * Added BER dumper. - * - * Revision 1.13 1995/05/22 11:32:02 quinn - * Fixing Interface to odr_null. - * - * Revision 1.12 1995/05/16 08:50:49 quinn - * License, documentation, and memory fixes - * - * Revision 1.11 1995/05/15 11:56:08 quinn - * More work on memory management. - * - * Revision 1.10 1995/04/18 08:15:20 quinn - * Added dynamic memory allocation on encoding (whew). Code is now somewhat - * neater. We'll make the same change for decoding one day. - * - * Revision 1.9 1995/04/10 10:23:11 quinn - * Smallish changes. - * - * Revision 1.8 1995/03/17 10:17:43 quinn - * Added memory management. - * - * Revision 1.7 1995/03/10 11:44:41 quinn - * Fixed serious stack-bug in odr_cons_begin - * - * Revision 1.6 1995/03/08 12:12:15 quinn - * Added better error checking. - * - * Revision 1.5 1995/03/07 13:28:57 quinn - * *** empty log message *** - * - * Revision 1.4 1995/03/07 13:16:13 quinn - * Fixed bug in odr_reset - * - * Revision 1.3 1995/03/07 10:21:31 quinn - * odr_errno-->odr_error - * - * Revision 1.2 1995/03/07 10:19:05 quinn - * Addded some method functions to the ODR type. - * - * Revision 1.1 1995/03/07 09:23:15 quinn - * Installing top-level API and documentation. * + * $Id: odr.c,v 1.37 2002-08-28 08:12:49 adam Exp $ * */ +#if HAVE_CONFIG_H +#include +#endif #include #include -#include -#include +#include +#include "odr-priv.h" + +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[] = { @@ -79,7 +34,8 @@ 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" }; char *odr_errmsg(int n) @@ -87,80 +43,101 @@ char *odr_errmsg(int n) return odr_errlist[n]; } -void MDF odr_perror(ODR o, char *message) +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) +int odr_set_charset(ODR o, const char *to, const char *from) +{ + if (o->op->iconv_handle) + yaz_iconv_close (o->op->iconv_handle); + + o->op->iconv_handle = yaz_iconv_open (to, from); + if (o->op->iconv_handle == 0) + return -1; + return 0; +} + +#include + +ODR odr_createmem(int direction) { - struct odr *r; + ODR r; - if (!(r = malloc(sizeof(*r)))) + 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->op = xmalloc (sizeof(*r->op)); + r->op->odr_ber_tag.lclass = -1; + r->op->iconv_handle = 0; 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; + o->op->stackp = -1; + nmem_reset(o->mem); o->choice_bias = -1; + o->lenlen = 1; + if (o->op->iconv_handle != 0) + yaz_iconv(o->op->iconv_handle, 0, 0, 0, 0); + 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) + nmem_destroy(o->mem); + if (o->buf && o->can_grow) + xfree(o->buf); + if (o->print && o->print != stderr) fclose(o->print); - free(o); + if (o->op->iconv_handle != 0) + yaz_iconv_close (o->op->iconv_handle); + xfree(o->op); + 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; }