Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / pkcs12 / p12_sbag.c

diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index d39ffe4ff9a1f5b9e66e0541fdfdab8ca71a38b8..7087294739014e4b77a758a4ac80ba84a1f0edc5 100644 (file)
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -58,17 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "pkcs12.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/pkcs12.h>
 
-/*
- *ASN1err(ASN1_F_PKCS12_SAFEBAG_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PKCS12_SAFEBAG,ASN1_R_DECODE_ERROR)
- */
-
-int i2d_PKCS12_SAFEBAG(a,pp)
-PKCS12_SAFEBAG *a;
-unsigned char **pp;
+int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **pp)
 {
        int bagnid, v = 0;
        M_ASN1_I2D_vars(a);
@@ -146,7 +139,7 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
 }
 
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_new()
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_new(void)
 {
        PKCS12_SAFEBAG *ret=NULL;
        ASN1_CTX c;
@@ -159,10 +152,8 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_new()
        M_ASN1_New_Error(ASN1_F_PKCS12_SAFEBAG_NEW);
 }
 
-PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(a,pp,length)
-PKCS12_SAFEBAG **a;
-unsigned char **pp;
-long length;
+PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, unsigned char **pp,
+            long length)
 {
        int bagnid;
        M_ASN1_D2I_vars(a,PKCS12_SAFEBAG *,PKCS12_SAFEBAG_new);
@@ -206,8 +197,7 @@ long length;
        M_ASN1_D2I_Finish(a, PKCS12_SAFEBAG_free, ASN1_F_D2I_PKCS12_SAFEBAG);
 }
 
-void PKCS12_SAFEBAG_free (a)
-PKCS12_SAFEBAG *a;
+void PKCS12_SAFEBAG_free (PKCS12_SAFEBAG *a)
 {
        if (a == NULL) return;
        switch (OBJ_obj2nid(a->type)) {