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 c5a50fc91026ecb85b72d759dce32adabf5c9fb6..50b3cec1fa598cc1c62cc239266e98bbd5aa568a 100644 (file)
--- 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 c9347235ead4fdb89e190e98ac29e99cf24f5d0e..e290e1702b279eda73188970c090c5843848418a 100644 (file)
--- 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 2c4dd6f796f917f24019fac2583d0b21ed87f9d6..e82d2a17c9c3cb33a3a212435fe0e981f489e9cb 100644 (file)
--- 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 e9209476b830932cf2473393989cef32d2028888..80170591f201a0bf70f1728112bc21e0c827d5b1 100644 (file)
--- 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 ea82b61a1833ae0db28e637d09f6ad7a3e8c3d7c..f40eb006eb1cbb826f18d6db362ac0296d714ec2 100644 (file)
--- 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 5860fcac72074bd5fd29fd76e46119142ae224ca..76deefcdc50fbffd3789f4e66f646e43f80f593f 100644 (file)
--- 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 0b1d031f1eca229ea7f733bdad3bef9fa47be49d..69b67111bc64d12ebff16632763785993ceebc56 100644 (file)
--- 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 f84fea3968c165917299d7c7a938f57b69cafb6f..fee4867f5209e0f7f3be81804f038dce03b91148 100644 (file)
--- 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;
        }