From: Adam Dickmeiss Date: Thu, 10 Jul 2008 09:16:35 +0000 (+0200) Subject: Minor reformatting. X-Git-Tag: v3.0.36~18 X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=138fbf3c4582f2738e5b30e440994c9b6d76e194;p=yaz-moved-to-github.git Minor reformatting. --- diff --git a/src/prt-ext.c b/src/prt-ext.c index c807348..2fa8c71 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -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; } diff --git a/src/zoom-c.c b/src/zoom-c.c index da43804..ea52a61 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -3412,7 +3412,7 @@ static Z_APDU *create_update_package(ZOOM_package p) } else notToKeep->elements[0]->correlationInfo = 0; - if ( recordOpaque_buf ) + if (recordOpaque_buf) { notToKeep->elements[0]->record = z_ext_record_oid_any(p->odr_out, syntax_oid,