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

warnings.

Reported by: Bernhard Simon.
This commit is contained in:
Geoff Thorpe 2002-12-13 22:01:46 +00:00
parent 6f7ac8e1b0
commit 4329db3726
8 changed files with 16 additions and 16 deletions

View File

@ -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;

View File

@ -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;
}

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}