Migrated pem_plugin_t to INIT/METHOD macros

This commit is contained in:
Andreas Steffen
2010-12-04 09:25:22 +01:00
parent cb458beb31
commit 9a76f6ded2
+10 -6
View File
@@ -33,10 +33,8 @@ struct private_pem_plugin_t {
pem_plugin_t public; pem_plugin_t public;
}; };
/** METHOD(plugin_t, destroy, void,
* Implementation of pem_plugin_t.pemtroy private_pem_plugin_t *this)
*/
static void destroy(private_pem_plugin_t *this)
{ {
lib->creds->remove_builder(lib->creds, lib->creds->remove_builder(lib->creds,
(builder_function_t)pem_private_key_load); (builder_function_t)pem_private_key_load);
@@ -52,9 +50,15 @@ static void destroy(private_pem_plugin_t *this)
*/ */
plugin_t *pem_plugin_create() plugin_t *pem_plugin_create()
{ {
private_pem_plugin_t *this = malloc_thing(private_pem_plugin_t); private_pem_plugin_t *this;
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; INIT(this,
.public = {
.plugin = {
.destroy = _destroy,
},
},
);
/* register private key PEM decoding builders */ /* register private key PEM decoding builders */
lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, FALSE, lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, FALSE,