denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated pubkey_plugin_t to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2010-12-04 15:43:04 +01:00
parent dd621140d3
commit 4df49844d9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pubkey/pubkey_plugin.c
+10 -6
View File
@@ -31,10 +31,8 @@ struct private_pubkey_plugin_t {
pubkey_plugin_t public; pubkey_plugin_t public;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of pubkey_plugin_t.pubkeytroy private_pubkey_plugin_t *this)
*/
static void destroy(private_pubkey_plugin_t *this)
{ {
lib->creds->remove_builder(lib->creds, lib->creds->remove_builder(lib->creds,
(builder_function_t)pubkey_cert_wrap); (builder_function_t)pubkey_cert_wrap);
@@ -46,9 +44,15 @@ static void destroy(private_pubkey_plugin_t *this)
*/ */
plugin_t *pubkey_plugin_create() plugin_t *pubkey_plugin_create()
{ {
private_pubkey_plugin_t *this = malloc_thing(private_pubkey_plugin_t); private_pubkey_plugin_t *this;
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; INIT(this,
.public = {
.plugin = {
.destroy = _destroy,
},
},
);
lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_TRUSTED_PUBKEY, FALSE, lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_TRUSTED_PUBKEY, FALSE,
(builder_function_t)pubkey_cert_wrap); (builder_function_t)pubkey_cert_wrap);