From: Geoff Thorpe <geoff@openssl.org>
Date: Fri, 13 Dec 2002 22:01:46 +0000 (+0000)
Subject: The ampersand is not required in these constructs, and was giving AIX
X-Git-Tag: OpenSSL_0_9_7-beta6~18^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4329db3726ef2010e6c5760f0ebe52dd447a63fd;p=thirdparty%2Fopenssl.git

The ampersand is not required in these constructs, and was giving AIX
warnings.

Reported by: Bernhard Simon.
---

diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index c5a50fc9102..50b3cec1fa5 100644
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c
@@ -81,7 +81,7 @@ int ENGINE_register_ciphers(ENGINE *e)
 		int num_nids = e->ciphers(e, NULL, &nids, 0);
 		if(num_nids > 0)
 			return engine_table_register(&cipher_table,
-					&engine_unregister_all_ciphers, e, nids,
+					engine_unregister_all_ciphers, e, nids,
 					num_nids, 0);
 		}
 	return 1;
@@ -103,7 +103,7 @@ int ENGINE_set_default_ciphers(ENGINE *e)
 		int num_nids = e->ciphers(e, NULL, &nids, 0);
 		if(num_nids > 0)
 			return engine_table_register(&cipher_table,
-					&engine_unregister_all_ciphers, e, nids,
+					engine_unregister_all_ciphers, e, nids,
 					num_nids, 1);
 		}
 	return 1;
diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index c9347235ead..e290e1702b2 100644
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.c
@@ -78,7 +78,7 @@ int ENGINE_register_DH(ENGINE *e)
 	{
 	if(e->dh_meth)
 		return engine_table_register(&dh_table,
-				&engine_unregister_all_DH, e, &dummy_nid, 1, 0);
+				engine_unregister_all_DH, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
@@ -94,7 +94,7 @@ int ENGINE_set_default_DH(ENGINE *e)
 	{
 	if(e->dh_meth)
 		return engine_table_register(&dh_table,
-				&engine_unregister_all_DH, e, &dummy_nid, 1, 1);
+				engine_unregister_all_DH, e, &dummy_nid, 1, 1);
 	return 1;
 	}
 
diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index 2c4dd6f796f..e82d2a17c9c 100644
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.c
@@ -81,7 +81,7 @@ int ENGINE_register_digests(ENGINE *e)
 		int num_nids = e->digests(e, NULL, &nids, 0);
 		if(num_nids > 0)
 			return engine_table_register(&digest_table,
-					&engine_unregister_all_digests, e, nids,
+					engine_unregister_all_digests, e, nids,
 					num_nids, 0);
 		}
 	return 1;
@@ -103,7 +103,7 @@ int ENGINE_set_default_digests(ENGINE *e)
 		int num_nids = e->digests(e, NULL, &nids, 0);
 		if(num_nids > 0)
 			return engine_table_register(&digest_table,
-					&engine_unregister_all_digests, e, nids,
+					engine_unregister_all_digests, e, nids,
 					num_nids, 1);
 		}
 	return 1;
diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index e9209476b83..80170591f20 100644
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.c
@@ -78,7 +78,7 @@ int ENGINE_register_DSA(ENGINE *e)
 	{
 	if(e->dsa_meth)
 		return engine_table_register(&dsa_table,
-				&engine_unregister_all_DSA, e, &dummy_nid, 1, 0);
+				engine_unregister_all_DSA, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
@@ -94,7 +94,7 @@ int ENGINE_set_default_DSA(ENGINE *e)
 	{
 	if(e->dsa_meth)
 		return engine_table_register(&dsa_table,
-				&engine_unregister_all_DSA, e, &dummy_nid, 1, 0);
+				engine_unregister_all_DSA, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
diff --git a/crypto/engine/tb_ecdh.c b/crypto/engine/tb_ecdh.c
index ea82b61a183..f40eb006eb1 100644
--- a/crypto/engine/tb_ecdh.c
+++ b/crypto/engine/tb_ecdh.c
@@ -93,7 +93,7 @@ int ENGINE_register_ECDH(ENGINE *e)
 	{
 	if(e->ecdh_meth)
 		return engine_table_register(&ecdh_table,
-				&engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);
+				engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
@@ -109,7 +109,7 @@ int ENGINE_set_default_ECDH(ENGINE *e)
 	{
 	if(e->ecdh_meth)
 		return engine_table_register(&ecdh_table,
-				&engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);
+				engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
diff --git a/crypto/engine/tb_ecdsa.c b/crypto/engine/tb_ecdsa.c
index 5860fcac720..76deefcdc50 100644
--- a/crypto/engine/tb_ecdsa.c
+++ b/crypto/engine/tb_ecdsa.c
@@ -78,7 +78,7 @@ int ENGINE_register_ECDSA(ENGINE *e)
 	{
 	if(e->ecdsa_meth)
 		return engine_table_register(&ecdsa_table,
-				&engine_unregister_all_ECDSA, e, &dummy_nid, 1, 0);
+				engine_unregister_all_ECDSA, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
@@ -94,7 +94,7 @@ int ENGINE_set_default_ECDSA(ENGINE *e)
 	{
 	if(e->ecdsa_meth)
 		return engine_table_register(&ecdsa_table,
-				&engine_unregister_all_ECDSA, e, &dummy_nid, 1, 0);
+				engine_unregister_all_ECDSA, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index 0b1d031f1ec..69b67111bc6 100644
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.c
@@ -78,7 +78,7 @@ int ENGINE_register_RAND(ENGINE *e)
 	{
 	if(e->rand_meth)
 		return engine_table_register(&rand_table,
-				&engine_unregister_all_RAND, e, &dummy_nid, 1, 0);
+				engine_unregister_all_RAND, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
@@ -94,7 +94,7 @@ int ENGINE_set_default_RAND(ENGINE *e)
 	{
 	if(e->rand_meth)
 		return engine_table_register(&rand_table,
-				&engine_unregister_all_RAND, e, &dummy_nid, 1, 1);
+				engine_unregister_all_RAND, e, &dummy_nid, 1, 1);
 	return 1;
 	}
 
diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index f84fea3968c..fee4867f520 100644
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.c
@@ -78,7 +78,7 @@ int ENGINE_register_RSA(ENGINE *e)
 	{
 	if(e->rsa_meth)
 		return engine_table_register(&rsa_table,
-				&engine_unregister_all_RSA, e, &dummy_nid, 1, 0);
+				engine_unregister_all_RSA, e, &dummy_nid, 1, 0);
 	return 1;
 	}
 
@@ -94,7 +94,7 @@ int ENGINE_set_default_RSA(ENGINE *e)
 	{
 	if(e->rsa_meth)
 		return engine_table_register(&rsa_table,
-				&engine_unregister_all_RSA, e, &dummy_nid, 1, 1);
+				engine_unregister_all_RSA, e, &dummy_nid, 1, 1);
 	return 1;
 	}