diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 11:26:02 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-04 11:26:02 +0100 |
| commit | 79bbe64e173313ae6aeec70d71dad2e5d599cfa0 (patch) | |
| tree | 2a419a149a54007080e406a882ccc14bf384b6e2 /src | |
| parent | 72c436c170d198b879e2c818383d03ff185c2ed6 (diff) | |
| download | strongswan-79bbe64e173313ae6aeec70d71dad2e5d599cfa0.tar.bz2 strongswan-79bbe64e173313ae6aeec70d71dad2e5d599cfa0.tar.xz | |
Migrated sha1_plugin_t to INIT/METHOD macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/plugins/sha1/sha1_plugin.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/libstrongswan/plugins/sha1/sha1_plugin.c b/src/libstrongswan/plugins/sha1/sha1_plugin.c index 7b9cf878f..a951bb231 100644 --- a/src/libstrongswan/plugins/sha1/sha1_plugin.c +++ b/src/libstrongswan/plugins/sha1/sha1_plugin.c @@ -32,10 +32,8 @@ struct private_sha1_plugin_t { sha1_plugin_t public; }; -/** - * Implementation of sha1_plugin_t.destroy - */ -static void destroy(private_sha1_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_sha1_plugin_t *this) { lib->crypto->remove_hasher(lib->crypto, (hasher_constructor_t)sha1_hasher_create); @@ -49,9 +47,15 @@ static void destroy(private_sha1_plugin_t *this) */ plugin_t *sha1_plugin_create() { - private_sha1_plugin_t *this = malloc_thing(private_sha1_plugin_t); + private_sha1_plugin_t *this; - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); lib->crypto->add_hasher(lib->crypto, HASH_SHA1, (hasher_constructor_t)sha1_hasher_create); |