diff options
Diffstat (limited to 'src/libcharon/plugins/stroke/stroke_plugin.c')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_plugin.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_plugin.c b/src/libcharon/plugins/stroke/stroke_plugin.c index 4361e5050..81274b599 100644 --- a/src/libcharon/plugins/stroke/stroke_plugin.c +++ b/src/libcharon/plugins/stroke/stroke_plugin.c @@ -36,10 +36,15 @@ struct private_stroke_plugin_t { stroke_socket_t *socket; }; +<<<<<<< HEAD /** * Implementation of stroke_plugin_t.destroy */ static void destroy(private_stroke_plugin_t *this) +======= +METHOD(plugin_t, destroy, void, + private_stroke_plugin_t *this) +>>>>>>> upstream/4.5.1 { this->socket->destroy(this->socket); free(this); @@ -50,11 +55,25 @@ static void destroy(private_stroke_plugin_t *this) */ plugin_t *stroke_plugin_create() { +<<<<<<< HEAD private_stroke_plugin_t *this = malloc_thing(private_stroke_plugin_t); this->public.plugin.destroy = (void(*)(plugin_t*))destroy; this->socket = stroke_socket_create(); +======= + private_stroke_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + .socket = stroke_socket_create(), + ); + +>>>>>>> upstream/4.5.1 if (this->socket == NULL) { free(this); |