X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fprt-ext.c;h=4ccdc1b8de35ddb3da24567591f2955cfd20d737;hb=9748d1f21b8a1c8c6f14ef9384c0e4fdb2d41585;hp=c8073482b633ab7c4fa1748bf4f0c4f78bdf93d1;hpb=a07a5e7fcd5417f81b546be932619b90e05ba72c;p=yaz-moved-to-github.git diff --git a/src/prt-ext.c b/src/prt-ext.c index c807348..4ccdc1b 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. */ @@ -318,7 +318,8 @@ Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len return thisext; } -Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int len) +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]; @@ -335,17 +336,16 @@ Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int thisext->direct_reference = odr_oiddup(o, oid); - { - thisext->which = Z_External_single; - thisext->u.single_ASN1_type = (Odr_any *)odr_malloc(o, sizeof(Odr_any)); - if ( ! thisext->u.single_ASN1_type ) - return 0; - thisext->u.single_ASN1_type->buf = (unsigned char *)odr_malloc(o, len); - if ( ! thisext->u.single_ASN1_type->buf ) - return 0; - memcpy(thisext->u.single_ASN1_type->buf, buf, len); - thisext->u.single_ASN1_type->len = thisext->u.single_ASN1_type->size = len; - } + thisext->which = Z_External_single; + thisext->u.single_ASN1_type = (Odr_any *) odr_malloc(o, sizeof(Odr_any)); + if (!thisext->u.single_ASN1_type) + return 0; + thisext->u.single_ASN1_type->buf = (unsigned char *) odr_malloc(o, len); + if (!thisext->u.single_ASN1_type->buf) + return 0; + memcpy(thisext->u.single_ASN1_type->buf, buf, len); + thisext->u.single_ASN1_type->len = thisext->u.single_ASN1_type->size = len; + return thisext; } @@ -367,6 +367,7 @@ Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab