Don't return stuff from void functions.

diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index a441cde1db46c980812662c11733a4315c0d9747..b36d62079a968c5295e950f9a3c8a0bfdf8d6249 100644 (file)
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -64,7 +64,7 @@ ASN1_BIT_STRING *ASN1_BIT_STRING_new(void)
 { return M_ASN1_BIT_STRING_new(); }
 
 void ASN1_BIT_STRING_free(ASN1_BIT_STRING *x)
-{ return M_ASN1_BIT_STRING_free(x); }
+{ M_ASN1_BIT_STRING_free(x); }
 
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 { return M_ASN1_BIT_STRING_set(x, d, len); }

diff --git a/crypto/asn1/a_bmp.c b/crypto/asn1/a_bmp.c
index eba61a77479236ded9c3f4281ae770b4a7e8bd6e..d9ac5a0475bb120b1289c0c37019a811f94089b2 100644 (file)
--- a/crypto/asn1/a_bmp.c
+++ b/crypto/asn1/a_bmp.c
@@ -64,7 +64,7 @@ ASN1_BMPSTRING *ASN1_BMPSTRING_new(void)
 { return M_ASN1_BMPSTRING_new(); }
 
 void ASN1_BMPSTRING_free(ASN1_BMPSTRING *x)
-{ return M_ASN1_BMPSTRING_free(x); }
+{ M_ASN1_BMPSTRING_free(x); }
 
 int i2d_ASN1_BMPSTRING(ASN1_BMPSTRING *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c
index 32cfe5b599e75aa51960acd16782285d490ba3a8..61349ed003ce20c5850d19dc5092ba8d7cfe740c 100644 (file)
--- a/crypto/asn1/a_enum.c
+++ b/crypto/asn1/a_enum.c
@@ -69,7 +69,7 @@ ASN1_ENUMERATED *ASN1_ENUMERATED_new(void)
 { return M_ASN1_ENUMERATED_new(); }
 
 void ASN1_ENUMERATED_free(ASN1_ENUMERATED *x)
-{ return M_ASN1_ENUMERATED_free(x); }
+{ M_ASN1_ENUMERATED_free(x); }
 
 int i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index d5b8bd99b23f72df6d825fe599d3dcc1cab38ed5..84062170e8389ca945a885ab0a6904bbb59fc1f8 100644 (file)
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -67,7 +67,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_new(void)
 { return M_ASN1_GENERALIZEDTIME_new(); }
 
 void ASN1_GENERALIZEDTIME_free(ASN1_GENERALIZEDTIME *x)
-{ return M_ASN1_GENERALIZEDTIME_free(x); }
+{ M_ASN1_GENERALIZEDTIME_free(x); }
 
 int i2d_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index de40623f42bfeaaa33f34c85e85b4d14d909e0ab..7ed99eb3994aff7f949e9bc8eb2c3d3489ff3ad7 100644 (file)
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -64,7 +64,7 @@ ASN1_INTEGER *ASN1_INTEGER_new(void)
 { return M_ASN1_INTEGER_new();}
 
 void ASN1_INTEGER_free(ASN1_INTEGER *x)
-{ return M_ASN1_INTEGER_free(x);}
+{ M_ASN1_INTEGER_free(x);}
 
 ASN1_INTEGER *ASN1_INTEGER_dup(ASN1_INTEGER *x)
 { return M_ASN1_INTEGER_dup(x);}

diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c
index b83e3ee35e446bc7006f3826db955eb16a537e27..260c1aff0d341ca7471e65d0e37936802e87b2b2 100644 (file)
--- a/crypto/asn1/a_mbstr.c
+++ b/crypto/asn1/a_mbstr.c
@@ -87,8 +87,8 @@ int ASN1_mbstring_copy(ASN1_STRING **out, unsigned char *in, int len,
        ASN1_STRING *dest;
        unsigned char *p;
        int nchar;
-       int (*cpyfunc)(unsigned long value, void *in) = NULL;
-       if(len == -1) len = strlen(in);
+       int (*cpyfunc)(unsigned long value, void *in_) = NULL;
+       if(len == -1) len = strlen((const char *)in);
 
        /* First do a string check and work out the number of characters */
        switch(inform) {

diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c
index bd6264eec16c65e823313474bf6d54adf35cbd41..2586f4327dc6e80071fb14a4fe312151928952a1 100644 (file)
--- a/crypto/asn1/a_octet.c
+++ b/crypto/asn1/a_octet.c
@@ -64,7 +64,7 @@ ASN1_OCTET_STRING *ASN1_OCTET_STRING_new(void)
 { return M_ASN1_OCTET_STRING_new(); }
 
 void ASN1_OCTET_STRING_free(ASN1_OCTET_STRING *x)
-{ return M_ASN1_OCTET_STRING_free(x); }
+{ M_ASN1_OCTET_STRING_free(x); }
 
 ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(ASN1_OCTET_STRING *x)
 { return M_ASN1_OCTET_STRING_dup(x); }

diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
index 21bdcdb9042e99d5d5d51c729636808118bedbdf..9a965d379c11933f318655aa905d0eb6ab21431e 100644 (file)
--- a/crypto/asn1/a_print.c
+++ b/crypto/asn1/a_print.c
@@ -64,7 +64,7 @@ ASN1_IA5STRING *ASN1_IA5STRING_new(void)
 { return M_ASN1_IA5STRING_new();}
 
 void ASN1_IA5STRING_free(ASN1_IA5STRING *x)
-{ return M_ASN1_IA5STRING_free(x);}
+{ M_ASN1_IA5STRING_free(x);}
 
 int i2d_ASN1_IA5STRING(ASN1_IA5STRING *a, unsigned char **pp)
        { return(M_i2d_ASN1_IA5STRING(a,pp)); }
@@ -77,7 +77,7 @@ ASN1_T61STRING *ASN1_T61STRING_new(void)
 { return M_ASN1_T61STRING_new();}
 
 void ASN1_T61STRING_free(ASN1_T61STRING *x)
-{ return M_ASN1_T61STRING_free(x);}
+{ M_ASN1_T61STRING_free(x);}
 
 ASN1_T61STRING *d2i_ASN1_T61STRING(ASN1_T61STRING **a, unsigned char **pp,
             long l)
@@ -87,7 +87,7 @@ ASN1_PRINTABLESTRING *ASN1_PRINTABLESTRING_new(void)
 { return M_ASN1_PRINTABLESTRING_new();}
 
 void ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *x)
-{ return M_ASN1_PRINTABLESTRING_free(x);}
+{ M_ASN1_PRINTABLESTRING_free(x);}
 
 ASN1_PRINTABLESTRING *d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a,
             unsigned char **pp, long l)
@@ -171,7 +171,7 @@ ASN1_STRING *DIRECTORYSTRING_new(void)
 { return M_DIRECTORYSTRING_new();}
 
 void DIRECTORYSTRING_free(ASN1_STRING *x)
-{ return M_DIRECTORYSTRING_free(x);}
+{ M_DIRECTORYSTRING_free(x);}
 
 int i2d_DIRECTORYSTRING(ASN1_STRING *a, unsigned char **pp)
        { return(M_i2d_DIRECTORYSTRING(a,pp)); }
@@ -184,7 +184,7 @@ ASN1_STRING *DISPLAYTEXT_new(void)
 { return M_DISPLAYTEXT_new();}
 
 void DISPLAYTEXT_free(ASN1_STRING *x)
-{ return M_DISPLAYTEXT_free(x);}
+{ M_DISPLAYTEXT_free(x);}
 
 int i2d_DISPLAYTEXT(ASN1_STRING *a, unsigned char **pp)
        { return(M_i2d_DISPLAYTEXT(a,pp)); }

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index d1900f68e459b57d4fe047958ec1e20e84f947c9..b193f1c71fb67637accd5eb591201f691845b8ab 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -70,7 +70,7 @@ ASN1_TIME *ASN1_TIME_new(void)
 { return M_ASN1_TIME_new(); }
 
 void ASN1_TIME_free(ASN1_TIME *x)
-{ return M_ASN1_TIME_free(x); }
+{ M_ASN1_TIME_free(x); }
 
 int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index ba349455a175856d4e441d36e416820da298c925..07565974e31f9b20a75bef7b8dad932177151512 100644 (file)
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -70,7 +70,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_new(void)
 { return M_ASN1_UTCTIME_new(); }
 
 void ASN1_UTCTIME_free(ASN1_UTCTIME *x)
-{ return M_ASN1_UTCTIME_free(x); }
+{ M_ASN1_UTCTIME_free(x); }
 
 int i2d_ASN1_UTCTIME(ASN1_UTCTIME *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c
index 16aab7f43e935266f2ebbb39df6ad03fa036c103..45434be4fac92039f209d766d993ff7d79a7a975 100644 (file)
--- a/crypto/asn1/a_utf8.c
+++ b/crypto/asn1/a_utf8.c
@@ -64,7 +64,7 @@ ASN1_UTF8STRING *ASN1_UTF8STRING_new(void)
 { return M_ASN1_UTF8STRING_new();}
 
 void ASN1_UTF8STRING_free(ASN1_UTF8STRING *x)
-{ return M_ASN1_UTF8STRING_free(x);}
+{ M_ASN1_UTF8STRING_free(x);}
 
 int i2d_ASN1_UTF8STRING(ASN1_UTF8STRING *a, unsigned char **pp)
        {

diff --git a/crypto/asn1/a_vis.c b/crypto/asn1/a_vis.c
index 3bc3d79f5d3e84f0be9186d6ab5f6f33a914a556..5cfc080bec31ac5ee2e03c3ff73ada4ca9fbbba4 100644 (file)
--- a/crypto/asn1/a_vis.c
+++ b/crypto/asn1/a_vis.c
@@ -64,7 +64,7 @@ ASN1_VISIBLESTRING *ASN1_VISIBLESTRING_new(void)
 { return M_ASN1_VISIBLESTRING_new(); }
 
 void ASN1_VISIBLESTRING_free(ASN1_VISIBLESTRING *x)
-{ return M_ASN1_VISIBLESTRING_free(x); }
+{ M_ASN1_VISIBLESTRING_free(x); }
 
 int i2d_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING *a, unsigned char **pp)
        {