diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 09:25:22 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 09:25:22 +0100 |
| commit | 9a76f6ded22b8c68c4862dff19f4564e3d61f607 (patch) | |
| tree | 05cfc934eb67fd7c32f0263ef3261f8f85aba68b /src | |
| parent | cb458beb319e46930a67c27db7ad52e10787d6b6 (diff) | |
| download | strongswan-9a76f6ded22b8c68c4862dff19f4564e3d61f607.tar.bz2 strongswan-9a76f6ded22b8c68c4862dff19f4564e3d61f607.tar.xz | |
Migrated pem_plugin_t to INIT/METHOD macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/plugins/pem/pem_plugin.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c index 83efb155b..f2415a318 100644 --- a/src/libstrongswan/plugins/pem/pem_plugin.c +++ b/src/libstrongswan/plugins/pem/pem_plugin.c @@ -33,10 +33,8 @@ struct private_pem_plugin_t { pem_plugin_t public; }; -/** - * Implementation of pem_plugin_t.pemtroy - */ -static void destroy(private_pem_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_pem_plugin_t *this) { lib->creds->remove_builder(lib->creds, (builder_function_t)pem_private_key_load); @@ -52,9 +50,15 @@ static void destroy(private_pem_plugin_t *this) */ plugin_t *pem_plugin_create() { - private_pem_plugin_t *this = malloc_thing(private_pem_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + private_pem_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); /* register private key PEM decoding builders */ lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, FALSE, |