X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_seq.c;h=1373e1906b8ccb9da4a157210d3fd4741d300d2b;hp=df8e12486946e8da73d34208bad7d26900e050e7;hb=d9ee01635f03f9095a66f71b73580560d48798e8;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55 diff --git a/odr/odr_seq.c b/odr/odr_seq.c index df8e124..1373e19 100644 --- a/odr/odr_seq.c +++ b/odr/odr_seq.c @@ -1,10 +1,67 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995-1999, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_seq.c,v $ - * Revision 1.7 1995-03-08 12:12:30 quinn + * Revision 1.25 1999-11-30 13:47:11 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.24 1999/04/20 09:56:48 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.23 1998/03/20 14:45:01 adam + * Implemented odr_enum and odr_set_of. + * + * Revision 1.22 1998/02/11 11:53:34 adam + * Changed code so that it compiles as C++. + * + * Revision 1.21 1997/11/24 11:33:56 adam + * Using function odr_nullval() instead of global ODR_NULLVAL when + * appropriate. + * + * Revision 1.20 1997/09/29 07:17:31 adam + * Added typecast to avoid warnings on MSVC. + * + * Revision 1.19 1997/06/23 10:31:11 adam + * Added RVDM's SEQUENCE OF patch again! + * + * Revision 1.18 1997/05/14 06:53:58 adam + * C++ support. + * + * Revision 1.17 1997/05/05 11:21:09 adam + * In handling of SEQUENCE OF: Counter set to zero when SEQUENCE + * OF isn't there at all. + * + * Revision 1.16 1995/09/29 17:12:26 quinn + * Smallish + * + * Revision 1.15 1995/09/27 15:03:00 quinn + * Modified function heads & prototypes. + * + * Revision 1.14 1995/08/15 11:16:39 quinn + * Fixed pretty-printers. + * + * Revision 1.13 1995/05/22 14:56:57 quinn + * Fixed problem in decoding empty sequence. + * + * Revision 1.12 1995/05/18 13:06:32 quinn + * Smallish. + * + * Revision 1.11 1995/05/17 08:41:54 quinn + * Small, hopefully insignificant change. + * + * Revision 1.10 1995/05/16 08:50:59 quinn + * License, documentation, and memory fixes + * + * Revision 1.9 1995/03/17 10:17:57 quinn + * Added memory management. + * + * Revision 1.8 1995/03/15 11:18:05 quinn + * Fixed serious bug in odr_cons + * + * Revision 1.7 1995/03/08 12:12:30 quinn * Added better error checking. * * Revision 1.6 1995/02/10 15:55:29 quinn @@ -27,10 +84,10 @@ * */ -#include #include +#include -int odr_sequence_begin(ODR o, void *p, int size) +int odr_sequence_begin(ODR o, void *p, int size, const char *name) { char **pp = (char**) p; @@ -43,59 +100,73 @@ int odr_sequence_begin(ODR o, void *p, int size) } if (o->direction == ODR_DECODE) *pp = 0; - if (odr_constructed_begin(o, p, o->t_class, o->t_tag)) + if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name)) { if (o->direction == ODR_DECODE && size) - *pp = nalloc(o, size); - if (o->direction == ODR_PRINT) - { - fprintf(o->print, "%s{\n", odr_indent(o)); - o->indent++; - } + *pp = (char *)odr_malloc(o, size); return 1; } else return 0; } -int odr_sequence_end(ODR o) +int odr_set_begin(ODR o, void *p, int size, const char *name) { - if (o->direction == ODR_PRINT) + char **pp = (char**) p; + + if (o->error) + return 0; + if (o->t_class < 0) + { + o->t_class = ODR_UNIVERSAL; + o->t_tag = ODR_SET; + } + if (o->direction == ODR_DECODE) + *pp = 0; + if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name)) { - assert(o->indent > 0); - o->indent--; - fprintf(o->print, "%s}\n", odr_indent(o)); + if (o->direction == ODR_DECODE && size) + *pp = (char *)odr_malloc(o, size); + return 1; } + else + return 0; +} + +int odr_sequence_end(ODR o) +{ return odr_constructed_end(o); } -int odr_sequence_more(ODR o) +int odr_set_end(ODR o) +{ + return odr_constructed_end(o); +} + +static int odr_sequence_more(ODR o) { return odr_constructed_more(o); } -int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num) +static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num) { char ***pp = (char***) p; /* for dereferencing */ - char **tmp; - char *dummy = "Nothing"; + char **tmp = 0; int size = 0, i; - if (!odr_sequence_begin(o, &dummy, 0)) - return 0; - switch (o->direction) { case ODR_DECODE: *num = 0; + *pp = (char **)odr_nullval(); while (odr_sequence_more(o)) { /* outgrown array? */ - if (*num * sizeof(void*) >= size) + if (*num * (int) sizeof(void*) >= size) { /* double the buffer size */ - tmp = nalloc(o, sizeof(void*) * (size += size ? size : - 128)); + tmp = (char **)odr_malloc(o, sizeof(void*) * + (size += size ? size : 128)); if (*num) { memcpy(tmp, *pp, *num * sizeof(void*)); @@ -106,15 +177,23 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num) } *pp = tmp; } - if (!(*type)(o, (*pp) + *num, 0)) + if (!(*type)(o, (*pp) + *num, 0, 0)) return 0; (*num)++; } break; case ODR_ENCODE: case ODR_PRINT: +#ifdef ODR_DEBUG + fprintf(stderr, "[seqof: num=%d]", *num); +#endif for (i = 0; i < *num; i++) - if (!(*type)(o, *pp + i, 0)) + { +#ifdef ODR_DEBUG + fprintf(stderr, "[seqof: elem #%d]", i); +#endif + if (!(*type)(o, *pp + i, 0, 0)) return 0; + } break; default: o->error = OOTHER; @@ -122,3 +201,25 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num) } return odr_sequence_end(o); } + +int odr_set_of(ODR o, Odr_fun type, void *p, int *num, const char *name) +{ + if (!odr_set_begin(o, p, 0, name)) { + if (o->direction == ODR_DECODE) + *num = 0; + return 0; + } + return odr_sequence_x (o, type, p, num); +} + +int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num, + const char *name) +{ + if (!odr_sequence_begin(o, p, 0, name)) { + if (o->direction == ODR_DECODE) + *num = 0; + return 0; + } + return odr_sequence_x (o, type, p, num); +} +