Use util/mklink.pl instead of util/mklink.sh.

[oweals/openssl.git] / crypto / asn1 / x_attrib.c

diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c
index 68b2648af3c2b6e0fa57e42531998154673e449e..78a7990c2fe1d2914d27b56e6ecc9756c832ccd8 100644 (file)
--- a/crypto/asn1/x_attrib.c
+++ b/crypto/asn1/x_attrib.c
@@ -58,19 +58,11 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "objects.h"
-#include "asn1_mac.h"
-
-/*
- * ASN1err(ASN1_F_D2I_X509_ATTRIBUTE,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_ATTRIBUTE_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- * ASN1err(ASN1_F_I2D_X509_ATTRIBUTE,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- */
+#include <openssl/objects.h>
+#include <openssl/asn1_mac.h>
 
 /* sequence */
-int i2d_X509_ATTRIBUTE(a,pp)
-X509_ATTRIBUTE *a;
-unsigned char **pp;
+int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
        {
        int k=0;
        int r=0,ret=0;
@@ -100,10 +92,8 @@ unsigned char **pp;
                }
        }
 
-X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(a,pp,length)
-X509_ATTRIBUTE **a;
-unsigned char **pp;
-long length;
+X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,X509_ATTRIBUTE *,X509_ATTRIBUTE_new);
 
@@ -126,10 +116,7 @@ long length;
        M_ASN1_D2I_Finish(a,X509_ATTRIBUTE_free,ASN1_F_D2I_X509_ATTRIBUTE);
        }
 
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(nid,atrtype,value)
-int nid;
-int atrtype;
-char *value;
+X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, char *value)
        {
        X509_ATTRIBUTE *ret=NULL;
        ASN1_TYPE *val=NULL;
@@ -150,7 +137,7 @@ err:
        return(NULL);
        }
 
-X509_ATTRIBUTE *X509_ATTRIBUTE_new()
+X509_ATTRIBUTE *X509_ATTRIBUTE_new(void)
        {
        X509_ATTRIBUTE *ret=NULL;
        ASN1_CTX c;
@@ -163,8 +150,7 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_new()
        M_ASN1_New_Error(ASN1_F_X509_ATTRIBUTE_NEW);
        }
        
-void X509_ATTRIBUTE_free(a)
-X509_ATTRIBUTE *a;
+void X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
        {
        if (a == NULL) return;
        ASN1_OBJECT_free(a->object);