X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fprt-ext.c;h=733010352e85fa9a81b7f3928c5c16b58ad9d327;hp=aad4cc7b8bdff77cacb467bf998b046c8f9528c9;hb=2715f6522ca62ab5dbc886c21ed18945743216f0;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/prt-ext.c b/src/prt-ext.c index aad4cc7..7330103 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -223,7 +223,7 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) Odr_oct *oct; int r; if (!odr_implicit_tag(o, odr_octetstring, &oct, - ODR_CONTEXT, 1, 0, "octetaligned")) + ODR_CONTEXT, 1, 0, "octetaligned")) return 0; /* Save our decoding ODR members */ @@ -261,18 +261,12 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len) { Z_External *thisext; - char oid_str_buf[OID_STR_MAX]; - const char *oid_str; - oid_class oclass; if (!oid) return 0; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); - thisext->direct_reference = odr_oiddup(o, oid); if (len < 0) /* Structured data */ @@ -314,8 +308,8 @@ Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len return 0; } } - else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) /* SUTRS is a single-ASN.1-type */ - { + else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) + { /* SUTRS is a single-ASN.1-type */ Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs)); thisext->which = Z_External_sutrs; @@ -343,18 +337,12 @@ Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int len) { Z_External *thisext; - char oid_str_buf[OID_STR_MAX]; - const char *oid_str; - oid_class oclass; if (!oid) return 0; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); - thisext->direct_reference = odr_oiddup(o, oid); thisext->which = Z_External_single;