Simplicate and add lightness.

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

diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index 8679263378ca59acc470c2c4db1c208fa83d6e18..09f5f7ad89f2297cfb5d5a31af26be496feb4b85 100644 (file)
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -62,23 +62,23 @@
 
 #ifndef NO_OLD_ASN1
 
-void *ASN1_dup(int (*i2d)(char *,void *), 
-              char *(*d2i)(void *,unsigned char **,long), char *x)
+void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x)
        {
        unsigned char *b,*p;
-       long i;
+       const unsigned char *p2;
+       int i;
        char *ret;
 
        if (x == NULL) return(NULL);
 
-       i=(long)i2d(x,NULL);
-       b=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
+       i=i2d(x,NULL);
+       b=OPENSSL_malloc(i+10);
        if (b == NULL)
                { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
        p= b;
        i=i2d(x,&p);
-       p= b;
-       ret=d2i(NULL,&p,i);
+       p2= b;
+       ret=d2i(NULL,&p2,i);
        OPENSSL_free(b);
        return(ret);
        }