Minor reformatting.
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Jul 2008 09:16:35 +0000 (11:16 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Jul 2008 09:16:35 +0000 (11:16 +0200)
src/prt-ext.c
src/zoom-c.c

index c807348..2fa8c71 100644 (file)
@@ -318,7 +318,8 @@ Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len
     return thisext;
 }
 
     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];
 {
     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->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;
 }
 
     return thisext;
 }
 
index da43804..ea52a61 100644 (file)
@@ -3412,7 +3412,7 @@ static Z_APDU *create_update_package(ZOOM_package p)
         }
         else
             notToKeep->elements[0]->correlationInfo = 0;
         }
         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,
         {
             notToKeep->elements[0]->record =
                 z_ext_record_oid_any(p->odr_out, syntax_oid,