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

Migrated delete_ike_sa_job_t to INIT/METHOD macros
---

diff --git a/src/libcharon/processing/jobs/delete_ike_sa_job.c b/src/libcharon/processing/jobs/delete_ike_sa_job.c
index dffd08ba38..1d86a992e1 100644
--- a/src/libcharon/processing/jobs/delete_ike_sa_job.c
+++ b/src/libcharon/processing/jobs/delete_ike_sa_job.c
@@ -41,19 +41,15 @@ struct private_delete_ike_sa_job_t {
 };
 
 
-/**
- * Implements job_t.destroy.
- */
-static void destroy(private_delete_ike_sa_job_t *this)
+METHOD(job_t, destroy, void,
+	private_delete_ike_sa_job_t *this)
 {
 	this->ike_sa_id->destroy(this->ike_sa_id);
 	free(this);
 }
 
-/**
- * Implementation of job_t.execute.
- */
-static void execute(private_delete_ike_sa_job_t *this)
+METHOD(job_t, execute, void,
+	private_delete_ike_sa_job_t *this)
 {
 	ike_sa_t *ike_sa;
 
@@ -93,7 +89,7 @@ static void execute(private_delete_ike_sa_job_t *this)
 			}
 		}
 	}
-	destroy(this);
+	_destroy(this);
 }
 
 /*
@@ -102,15 +98,18 @@ static void execute(private_delete_ike_sa_job_t *this)
 delete_ike_sa_job_t *delete_ike_sa_job_create(ike_sa_id_t *ike_sa_id,
 											  bool delete_if_established)
 {
-	private_delete_ike_sa_job_t *this = malloc_thing(private_delete_ike_sa_job_t);
-
-	/* interface functions */
-	this->public.job_interface.execute = (void (*) (job_t *)) execute;
-	this->public.job_interface.destroy = (void (*)(job_t *)) destroy;;
+	private_delete_ike_sa_job_t *this;
 
-	/* private variables */
-	this->ike_sa_id = ike_sa_id->clone(ike_sa_id);
-	this->delete_if_established = delete_if_established;
+	INIT(this,
+		.public = {
+			.job_interface = {
+				.execute = _execute,
+				.destroy = _destroy,
+			},
+		},
+		.ike_sa_id = ike_sa_id->clone(ike_sa_id),
+		.delete_if_established = delete_if_established,
+	);
 
 	return &(this->public);
 }