Don't return stuff from void functions.

[openssl.git] / crypto / asn1 / pkcs8.c

diff --git a/crypto/asn1/pkcs8.c b/crypto/asn1/pkcs8.c
index bd0d191530d4410ed31b71f950f2d266a8554be1..29c4ea6a296cc660ea9db6f00a74f43832d81c96 100644 (file)
--- a/crypto/asn1/pkcs8.c
+++ b/crypto/asn1/pkcs8.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/pkcs8.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,17 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "objects.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/objects.h>
 
-/*
- * ASN1err(ASN1_F_D2I_X509_KEY,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_KEY_NEW,ASN1_R_BAD_GET_OBJECT);
- */
-
-int i2d_X509_KEY(a,pp)
-X509 *a;
-unsigned char **pp;
+int i2d_X509_KEY(X509 *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -85,10 +78,7 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-X509 *d2i_X509_KEY(a,pp,length)
-X509 **a;
-unsigned char **pp;
-long length;
+X509 *d2i_X509_KEY(X509 **a, unsigned char **pp, long length)
        {
        M_ASN1_D2I_vars(a,X509 *,X509_new);
 
@@ -100,7 +90,7 @@ long length;
        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
        }
 
-X509 *X509_KEY_new()
+X509 *X509_KEY_new(void)
        {
        X509_KEY *ret=NULL;
 
@@ -114,14 +104,16 @@ X509 *X509_KEY_new()
        M_ASN1_New_Error(ASN1_F_X509_NEW);
        }
 
-void X509_KEY_free(a)
-X509 *a;
+void X509_KEY_free(X509 *a)
        {
        int i;
 
        if (a == NULL) return;
 
        i=CRYPTO_add_lock(&a->references,-1,CRYPTO_LOCK_X509_KEY);
+#ifdef REF_PRINT
+       REF_PRINT("X509_KEY",a);
+#endif
        if (i > 0) return;
 #ifdef REF_CHECK
        if (i < 0)