diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-07 08:01:45 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-07 08:01:56 +0100 |
| commit | d31aec9fa7121e06038228befb7bdd2a2b01de7c (patch) | |
| tree | 479c50d36c991d677662d3e1eb79c02b1fcbb58e | |
| parent | 76ce213c4367e95af7220e9baf828b7924bdc17b (diff) | |
| download | strongswan-d31aec9fa7121e06038228befb7bdd2a2b01de7c.tar.bz2 strongswan-d31aec9fa7121e06038228befb7bdd2a2b01de7c.tar.xz | |
Migrated stroke_plugin_t to INIT/METHOD macros
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_plugin.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_plugin.c b/src/libcharon/plugins/stroke/stroke_plugin.c index 4361e5050..2e83d0d28 100644 --- a/src/libcharon/plugins/stroke/stroke_plugin.c +++ b/src/libcharon/plugins/stroke/stroke_plugin.c @@ -36,10 +36,8 @@ struct private_stroke_plugin_t { stroke_socket_t *socket; }; -/** - * Implementation of stroke_plugin_t.destroy - */ -static void destroy(private_stroke_plugin_t *this) +METHOD(plugin_t, destroy, void, + private_stroke_plugin_t *this) { this->socket->destroy(this->socket); free(this); @@ -50,11 +48,17 @@ static void destroy(private_stroke_plugin_t *this) */ plugin_t *stroke_plugin_create() { - private_stroke_plugin_t *this = malloc_thing(private_stroke_plugin_t); + private_stroke_plugin_t *this; - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + .socket = stroke_socket_create(), + ); - this->socket = stroke_socket_create(); if (this->socket == NULL) { free(this); |