X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oid.c;h=374092a65f8f27caaa4edc1a03a59df77b7d691a;hb=fb2db0abc51ed82583dc4600fd4ff035c96f7d79;hp=780cbdd8d573e6295004248dac48ad7ae0cd8ad9;hpb=b40d7c8dfa49bf5e6800688e1dfb1373856796a8;p=yaz-moved-to-github.git diff --git a/odr/odr_oid.c b/odr/odr_oid.c index 780cbdd..374092a 100644 --- a/odr/odr_oid.c +++ b/odr/odr_oid.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_oid.c,v $ - * Revision 1.2 1995-02-07 14:13:46 quinn + * Revision 1.5 1995-02-10 18:57:26 quinn + * More in the way of error-checking. + * + * Revision 1.4 1995/02/10 15:55:29 quinn + * Bug fixes, mostly. + * + * Revision 1.3 1995/02/09 15:51:49 quinn + * Works better now. + * + * Revision 1.2 1995/02/07 14:13:46 quinn * Bug fixes. * * Revision 1.1 1995/02/03 17:04:38 quinn @@ -28,22 +37,21 @@ int odr_oid(ODR o, Odr_oid **p, int opt) o->t_class = ODR_UNIVERSAL; o->t_tag = ODR_OID; } - if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0) - { - *p = 0; + if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0) return 0; - } if (!res || cons) - { - *p = 0; return opt; - } if (o->direction == ODR_PRINT) { - fprintf(o->print, "OID\n"); + int i; + + fprintf(o->print, "%sOID:", odr_indent(o)); + for (i = 0; (*p)[i] > -1; i++) + fprintf(o->print, " %d", (*p)[i]); + fprintf(o->print, "\n"); return 1; } if (o->direction == ODR_DECODE) - *p = nalloc(o, ODR_OID_SIZE); + *p = nalloc(o, ODR_OID_SIZE * sizeof(**p)); return ber_oid(o, *p); }