X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_seq.c;h=66377f83bf7af1691997b110da1b6433ca280e6f;hp=bb55971238a94417e549f3d56e4f68b2dcd44c79;hb=0ff5815242556923f24a9dcbbad9ebe30e64f165;hpb=86927dcf1fb5dbd4d30f2d906ff5ceba7319f142 diff --git a/odr/odr_seq.c b/odr/odr_seq.c index bb55971..66377f8 100644 --- a/odr/odr_seq.c +++ b/odr/odr_seq.c @@ -4,7 +4,21 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_seq.c,v $ - * Revision 1.12 1995-05-18 13:06:32 quinn + * 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 * Smallish. * * Revision 1.11 1995/05/17 08:41:54 quinn @@ -62,11 +76,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 @@ -75,12 +84,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); } @@ -92,7 +95,7 @@ int odr_sequence_more(ODR o) int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num) { char ***pp = (char***) p; /* for dereferencing */ - char **tmp; + char **tmp = 0; int size = 0, i; if (!odr_sequence_begin(o, p, 0)) @@ -102,6 +105,7 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num) { case ODR_DECODE: *num = 0; + *pp = ODR_NULLVAL; while (odr_sequence_more(o)) { /* outgrown array? */