X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=1fede3d5f7aee979505cca6812fbbfd8c179e554;hb=113640450c45ca7ac96285cc8ca666bfd597ed21;hp=e1ec9f11d8f6ccdbd0fb56e4f26d47593ff3bceb;hpb=426dee508ccda399a2ec5a43d26e97493184db2a;p=yaz-moved-to-github.git diff --git a/odr/odr_seq.c b/odr/odr_seq.c index e1ec9f1..1fede3d 100644 --- a/odr/odr_seq.c +++ b/odr/odr_seq.c @@ -4,7 +4,28 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_seq.c,v $ - * Revision 1.13 1995-05-22 14:56:57 quinn + * 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. + * CV:e ---------------------------------------------------------------------- + * CV:e ---------------------------------------------------------------------- + * + * 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 @@ -65,11 +86,6 @@ int odr_sequence_begin(ODR o, void *p, int size) { if (o->direction == ODR_DECODE && size) *pp = odr_malloc(o, size); - if (o->direction == ODR_PRINT) - { - fprintf(o->print, "%s{\n", odr_indent(o)); - o->indent++; - } return 1; } else @@ -78,12 +94,6 @@ int odr_sequence_begin(ODR o, void *p, int size) int odr_sequence_end(ODR o) { - if (o->direction == ODR_PRINT) - { - assert(o->indent > 0); - o->indent--; - fprintf(o->print, "%s}\n", odr_indent(o)); - } return odr_constructed_end(o); } @@ -98,8 +108,11 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num) char **tmp = 0; int size = 0, i; - if (!odr_sequence_begin(o, p, 0)) + if (!odr_sequence_begin(o, p, 0)) { + if (o->direction == ODR_DECODE) + *num = 0; return 0; + } switch (o->direction) {