From 0d430d4f54c2f809d334b52e220ee962b78faa27 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 3 Oct 2011 18:56:21 +0200 Subject: [PATCH] Migrated stroke_socket_t to INIT/METHOD macros. --- src/libcharon/plugins/stroke/stroke_socket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c index 7b38c66060..3fd21d213c 100644 --- a/src/libcharon/plugins/stroke/stroke_socket.c +++ b/src/libcharon/plugins/stroke/stroke_socket.c @@ -680,10 +680,8 @@ static bool open_socket(private_stroke_socket_t *this) return TRUE; } -/** - * Implementation of stroke_socket_t.destroy - */ -static void destroy(private_stroke_socket_t *this) +METHOD(stroke_socket_t, destroy, void, + private_stroke_socket_t *this) { this->job->cancel(this->job); lib->credmgr->remove_set(lib->credmgr, &this->ca->set); @@ -704,9 +702,13 @@ static void destroy(private_stroke_socket_t *this) */ stroke_socket_t *stroke_socket_create() { - private_stroke_socket_t *this = malloc_thing(private_stroke_socket_t); + private_stroke_socket_t *this; - this->public.destroy = (void(*)(stroke_socket_t*))destroy; + INIT(this, + .public = { + .destroy = _destroy, + }, + ); if (!open_socket(this)) { -- 2.47.2