X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=a69d49bd88c851a8720e71f7d5c41736ae3f9e79;hp=45735b6428e7732b6ac54d8b5a532fd9e8d4bcc0;hb=78f86cdd3cc8d44fb8c4329e408a3aa679bd8b9e;hpb=a7b235097c10590dde6dfa1859590d4c4e930366 diff --git a/asn/proto.c b/asn/proto.c index 45735b6..a69d49b 100644 --- a/asn/proto.c +++ b/asn/proto.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: proto.c,v $ - * Revision 1.29 1995-06-15 07:44:49 quinn + * Revision 1.30 1995-06-15 15:42:01 quinn + * Fixed some v3 bugs + * + * Revision 1.29 1995/06/15 07:44:49 quinn * Moving to v3. * * Revision 1.28 1995/06/14 15:26:35 quinn @@ -780,6 +783,20 @@ int z_DiagRec(ODR o, Z_DiagRec **p, int opt) #endif +int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt) +{ + if (o->direction == ODR_DECODE) + *p = odr_malloc(o, sizeof(**p)); + else if (!*p) + return opt; + + if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs, + &(*p)->num_diagRecs)) + return 1; + *p = 0; + return 0; +} + int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt) { static Odr_arm arm[] = @@ -817,10 +834,12 @@ int z_NamePlusRecordList(ODR o, Z_NamePlusRecordList **p, int opt) int z_Records(ODR o, Z_Records **p, int opt) { - Odr_arm arm[] = + static Odr_arm arm[] = { {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, z_NamePlusRecordList}, {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, z_DiagRec}, + {ODR_IMPLICIT, ODR_CONTEXT, 205, Z_Records_multipleNSD, + z_DiagRecs}, {-1, -1, -1, -1, 0} }; @@ -1012,20 +1031,6 @@ int z_Entries(ODR o, Z_Entries **p, int opt) return 0; } -int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt) -{ - if (o->direction == ODR_DECODE) - *p = odr_malloc(o, sizeof(**p)); - else if (!*p) - return opt; - - if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs, - &(*p)->num_diagRecs)) - return 1; - *p = 0; - return 0; -} - int z_ListEntries(ODR o, Z_ListEntries **p, int opt) { static Odr_arm arm[] =