From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 10 Feb 2011 07:22:57 +0000 (+0100)
Subject: Migrated roam_job_t to INIT/METHOD macros
X-Git-Tag: 4.5.1~12
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e76d12bb9ebc00a100ef9d38319eee12be56f452;p=thirdparty%2Fstrongswan.git

Migrated roam_job_t to INIT/METHOD macros
---

diff --git a/src/libcharon/processing/jobs/roam_job.c b/src/libcharon/processing/jobs/roam_job.c
index adc884a8ab..74ef8bd6dc 100644
--- a/src/libcharon/processing/jobs/roam_job.c
+++ b/src/libcharon/processing/jobs/roam_job.c
@@ -38,18 +38,14 @@ struct private_roam_job_t {
 	bool address;
 };
 
-/**
- * Implements job_t.destroy.
- */
-static void destroy(private_roam_job_t *this)
+METHOD(job_t, destroy, void,
+	private_roam_job_t *this)
 {
 	free(this);
 }
 
-/**
- * Implementation of job_t.execute.
- */
-static void execute(private_roam_job_t *this)
+METHOD(job_t, execute, void,
+	private_roam_job_t *this)
 {
 	ike_sa_t *ike_sa;
 	linked_list_t *list;
@@ -94,12 +90,17 @@ static void execute(private_roam_job_t *this)
  */
 roam_job_t *roam_job_create(bool address)
 {
-	private_roam_job_t *this = malloc_thing(private_roam_job_t);
-
-	this->public.job_interface.execute = (void (*) (job_t *)) execute;
-	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
-
-	this->address = address;
+	private_roam_job_t *this;
+
+	INIT(this,
+		.public = {
+			.job_interface = {
+				.execute = _execute,
+				.destroy = _destroy,
+			},
+		},
+		.address = address,
+	);
 
 	return &this->public;
 }