Imported Upstream version 4.5.2

1 files changed, 19 insertions, 7 deletions

diff --git a/src/libcharon/plugins/unit_tester/unit_tester.c b/src/libcharon/plugins/unit_tester/unit_tester.c
index 5f6f94e03..ad7dba7a5 100644
--- a/src/libcharon/plugins/unit_tester/unit_tester.c
+++ b/src/libcharon/plugins/unit_tester/unit_tester.c
@@ -92,10 +92,14 @@ static void run_tests(private_unit_tester_t *this)
 		 success, run, failed, skipped);
 }
 
-/**
- * Implementation of 2007_t.destroy
- */
-static void destroy(private_unit_tester_t *this)
+METHOD(plugin_t, get_name, char*,
+	private_unit_tester_t *this)
+{
+	return "unit-tester";
+}
+
+METHOD(plugin_t, destroy, void,
+	private_unit_tester_t *this)
 {
 	free(this);
 }
@@ -105,9 +109,17 @@ static void destroy(private_unit_tester_t *this)
  */
 plugin_t *unit_tester_plugin_create()
 {
-	private_unit_tester_t *this = malloc_thing(private_unit_tester_t);
-
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+	private_unit_tester_t *this;
+
+	INIT(this,
+		.public = {
+			.plugin = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
+				.destroy = _destroy,
+			},
+		},
+	);
 
 	run_tests(this);