Migrated stroke_plugin_t to INIT/METHOD macros
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 7 Dec 2010 07:01:45 +0000 (08:01 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 7 Dec 2010 07:01:56 +0000 (08:01 +0100)
src/libcharon/plugins/stroke/stroke_plugin.c

index 4361e50..2e83d0d 100644 (file)
@@ -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);