From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 4 Oct 2011 10:12:04 +0000 (+0200)
Subject: Migrated uci_control_t to INIT/METHOD macros.
X-Git-Tag: 4.6.0~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e751bc9aab83eac0defc91051e9a670a0da734bc;p=thirdparty%2Fstrongswan.git

Migrated uci_control_t to INIT/METHOD macros.
---

diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c
index bb08de2d78..af4a6a7114 100644
--- a/src/libcharon/plugins/uci/uci_control.c
+++ b/src/libcharon/plugins/uci/uci_control.c
@@ -266,10 +266,8 @@ static job_requeue_t receive(private_uci_control_t *this)
 	return JOB_REQUEUE_FAIR;
 }
 
-/**
- * Implementation of uci_control_t.destroy
- */
-static void destroy(private_uci_control_t *this)
+METHOD(uci_control_t, destroy, void,
+	private_uci_control_t *this)
 {
 	this->job->cancel(this->job);
 	unlink(FIFO_FILE);
@@ -281,9 +279,13 @@ static void destroy(private_uci_control_t *this)
  */
 uci_control_t *uci_control_create()
 {
-	private_uci_control_t *this = malloc_thing(private_uci_control_t);
+	private_uci_control_t *this;
 
-	this->public.destroy = (void(*)(uci_control_t*))destroy;
+	INIT(this,
+		.public = {
+			.destroy = _destroy,
+		},
+	);
 
 	unlink(FIFO_FILE);
 	if (mkfifo(FIFO_FILE, S_IRUSR|S_IWUSR) != 0)