From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 10 Feb 2011 07:31:46 +0000 (+0100)
Subject: Migrated update_sa_job_t to INIT/METHOD macros
X-Git-Tag: 4.5.1~9
X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=3cd805a1152a7ff53394d479afb273203966838f

Migrated update_sa_job_t to INIT/METHOD macros
---

diff --git a/src/libcharon/processing/jobs/update_sa_job.c b/src/libcharon/processing/jobs/update_sa_job.c
index a88ce72..3b4e994 100644
--- a/src/libcharon/processing/jobs/update_sa_job.c
+++ b/src/libcharon/processing/jobs/update_sa_job.c
@@ -43,19 +43,15 @@ struct private_update_sa_job_t {
 	host_t *new;
 };
 
-/**
- * Implements job_t.destroy.
- */
-static void destroy(private_update_sa_job_t *this)
+METHOD(job_t, destroy, void,
+	private_update_sa_job_t *this)
 {
 	this->new->destroy(this->new);
 	free(this);
 }
 
-/**
- * Implementation of job_t.execute.
- */
-static void execute(private_update_sa_job_t *this)
+METHOD(job_t, execute, void,
+	private_update_sa_job_t *this)
 {
 	ike_sa_t *ike_sa;
 
@@ -83,13 +79,18 @@ static void execute(private_update_sa_job_t *this)
  */
 update_sa_job_t *update_sa_job_create(u_int32_t reqid, host_t *new)
 {
-	private_update_sa_job_t *this = malloc_thing(private_update_sa_job_t);
-
-	this->public.job_interface.execute = (void (*) (job_t *)) execute;
-	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
-
-	this->reqid = reqid;
-	this->new = new;
+	private_update_sa_job_t *this;
+
+	INIT(this,
+		.public = {
+			.job_interface = {
+				.execute = _execute,
+				.destroy = _destroy,
+			},
+		},
+		.reqid = reqid,
+		.new = new,
+	);
 
 	return &this->public;
 }