More KNF.

1 files changed, 37 insertions, 30 deletions

diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c
index 07ce15dbd7..4d3e2ebd17 100644
--- a/src/lib/libcrypto/asn1/x_info.c
+++ b/src/lib/libcrypto/asn1/x_info.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -62,42 +62,49 @@
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 
-X509_INFO *X509_INFO_new(void)
+X509_INFO *
+X509_INFO_new(void)
 {
-        X509_INFO *ret=NULL;
+        X509_INFO *ret = NULL;
 
-        ret=(X509_INFO *)malloc(sizeof(X509_INFO));
+        ret = (X509_INFO *)malloc(sizeof(X509_INFO));
         if (ret == NULL) {
-                ASN1err(ASN1_F_X509_INFO_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
+                ASN1err(ASN1_F_X509_INFO_NEW, ERR_R_MALLOC_FAILURE);
+                return (NULL);
         }
- 
-        ret->enc_cipher.cipher=NULL;
-        ret->enc_len=0;
-        ret->enc_data=NULL;
- 
-        ret->references=1;
-        ret->x509=NULL;
-        ret->crl=NULL;
-        ret->x_pkey=NULL;
-        return(ret);
+
+        ret->enc_cipher.cipher = NULL;
+        ret->enc_len = 0;
+        ret->enc_data = NULL;
+
+        ret->references = 1;
+        ret->x509 = NULL;
+        ret->crl = NULL;
+        ret->x_pkey = NULL;
+        return (ret);
 }
 
-void X509_INFO_free(X509_INFO *x)
+void
+X509_INFO_free(X509_INFO *x)
 {
         int i;
 
-        if (x == NULL) return;
+        if (x == NULL)
+                return;
 
-        i=CRYPTO_add(&x->references,-1,CRYPTO_LOCK_X509_INFO);
-        if (i > 0) return;
+        i = CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_INFO);
+        if (i > 0)
+                return;
 
-        if (x->x509 != NULL) X509_free(x->x509);
-        if (x->crl != NULL) X509_CRL_free(x->crl);
-        if (x->x_pkey != NULL) X509_PKEY_free(x->x_pkey);
-        if (x->enc_data != NULL) free(x->enc_data);
+        if (x->x509 != NULL)
+                X509_free(x->x509);
+        if (x->crl != NULL)
+                X509_CRL_free(x->crl);
+        if (x->x_pkey != NULL)
+                X509_PKEY_free(x->x_pkey);
+        if (x->enc_data != NULL)
+                free(x->enc_data);
         free(x);
 }
 
 IMPLEMENT_STACK_OF(X509_INFO)
-