Change functions to ANSI C.

1 files changed, 16 insertions, 46 deletions

diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index 5f26e40af2..7c79728771 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -68,10 +68,7 @@ static char *strip_spaces(char *name);
 
 /* Add a CONF_VALUE name value pair to stack */
 
-int X509V3_add_value(name, value, extlist)
-const char *name;
-const char *value;
-STACK **extlist;
+int X509V3_add_value(const char *name, const char *value, STACK **extlist)
 {
 	CONF_VALUE *vtmp = NULL;
 	char *tname = NULL, *tvalue = NULL;
@@ -94,8 +91,7 @@ STACK **extlist;
 
 /* Free function for STACK of CONF_VALUE */
 
-void X509V3_conf_free(conf)
-CONF_VALUE *conf;
+void X509V3_conf_free(CONF_VALUE *conf)
 {
 	if(!conf) return;
 	if(conf->name) Free(conf->name);
@@ -104,28 +100,20 @@ CONF_VALUE *conf;
 	Free((char *)conf);
 }
 
-int X509V3_add_value_bool(name, asn1_bool, extlist)
-const char *name;
-int asn1_bool;
-STACK **extlist;
+int X509V3_add_value_bool(const char *name, int asn1_bool, STACK **extlist)
 {
 	if(asn1_bool) return X509V3_add_value(name, "TRUE", extlist);
 	return X509V3_add_value(name, "FALSE", extlist);
 }
 
-int X509V3_add_value_bool_nf(name, asn1_bool, extlist)
-char *name;
-int asn1_bool;
-STACK **extlist;
+int X509V3_add_value_bool_nf(char *name, int asn1_bool, STACK **extlist)
 {
 	if(asn1_bool) return X509V3_add_value(name, "TRUE", extlist);
 	return 1;
 }
 
 
-char *i2s_ASN1_ENUMERATED(method, a)
-X509V3_EXT_METHOD *method;
-ASN1_ENUMERATED *a;
+char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *method, ASN1_ENUMERATED *a)
 {
 	BIGNUM *bntmp = NULL;
 	char *strtmp = NULL;
@@ -137,9 +125,7 @@ ASN1_ENUMERATED *a;
 	return strtmp;
 }
 
-char *i2s_ASN1_INTEGER(method, a)
-X509V3_EXT_METHOD *method;
-ASN1_INTEGER *a;
+char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, ASN1_INTEGER *a)
 {
 	BIGNUM *bntmp = NULL;
 	char *strtmp = NULL;
@@ -151,9 +137,7 @@ ASN1_INTEGER *a;
 	return strtmp;
 }
 
-ASN1_INTEGER *s2i_ASN1_INTEGER(method, value)
-X509V3_EXT_METHOD *method;
-char *value;
+ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, char *value)
 {
 	BIGNUM *bn = NULL;
 	ASN1_INTEGER *aint;
@@ -175,10 +159,8 @@ char *value;
 	return aint;
 }
 
-int X509V3_add_value_int(name, aint, extlist)
-const char *name;
-ASN1_INTEGER *aint;
-STACK **extlist;
+int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
+	     STACK **extlist)
 {
 	char *strtmp;
 	int ret;
@@ -189,9 +171,7 @@ STACK **extlist;
 	return ret;
 }
 
-int X509V3_get_value_bool(value, asn1_bool)
-CONF_VALUE *value;
-int *asn1_bool;
+int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool)
 {
 	char *btmp;
 	if(!(btmp = value->value)) goto err;
@@ -212,9 +192,7 @@ int *asn1_bool;
 	return 0;
 }
 
-int X509V3_get_value_int(value, aint)
-CONF_VALUE *value;
-ASN1_INTEGER **aint;
+int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint)
 {
 	ASN1_INTEGER *itmp;
 	if(!(itmp = s2i_ASN1_INTEGER(NULL, value->value))) {
@@ -230,8 +208,7 @@ ASN1_INTEGER **aint;
 
 /*#define DEBUG*/
 
-STACK *X509V3_parse_list(line)
-char *line;
+STACK *X509V3_parse_list(char *line)
 {
 	char *p, *q, c;
 	char *ntmp, *vtmp;
@@ -323,8 +300,7 @@ return NULL;
 }
 
 /* Delete leading and trailing spaces from a string */
-static char *strip_spaces(name)
-char *name;
+static char *strip_spaces(char *name)
 {
 	char *p, *q;
 	/* Skip over leading spaces */
@@ -344,9 +320,7 @@ char *name;
  * hex representation
  */
 
-char *hex_to_string(buffer, len)
-unsigned char *buffer;
-long len;
+char *hex_to_string(unsigned char *buffer, long len)
 {
 	char *tmp, *q;
 	unsigned char *p;
@@ -371,9 +345,7 @@ long len;
  * a buffer
  */
 
-unsigned char *string_to_hex(str, len)
-char *str;
-long *len;
+unsigned char *string_to_hex(char *str, long *len)
 {
 	unsigned char *hexbuf, *q;
 	unsigned char ch, cl, *p;
@@ -425,9 +397,7 @@ long *len;
  * cmp or cmp.*
  */
 
-int name_cmp(name, cmp)
-const char *name;
-const char *cmp;
+int name_cmp(const char *name, const char *cmp)
 {
 	int len, ret;
 	char c;