From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 10 Feb 2011 06:59:43 +0000 (+0100)
Subject: _ prefix not required
X-Git-Tag: 4.5.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c4a21bd90f762f6be116529899ceb1deed4c0e;p=thirdparty%2Fstrongswan.git

_ prefix not required
---

diff --git a/src/libcharon/processing/jobs/acquire_job.c b/src/libcharon/processing/jobs/acquire_job.c
index e969b648fe..3544dd3327 100644
--- a/src/libcharon/processing/jobs/acquire_job.c
+++ b/src/libcharon/processing/jobs/acquire_job.c
@@ -58,7 +58,7 @@ METHOD(job_t, execute, void,
 {
 	charon->traps->acquire(charon->traps, this->reqid,
 						   this->src_ts, this->dst_ts);
-	_destroy(this);
+	destroy(this);
 }
 
 /*
diff --git a/src/libcharon/processing/jobs/delete_child_sa_job.c b/src/libcharon/processing/jobs/delete_child_sa_job.c
index 5a1fb94209..29122cd030 100644
--- a/src/libcharon/processing/jobs/delete_child_sa_job.c
+++ b/src/libcharon/processing/jobs/delete_child_sa_job.c
@@ -70,7 +70,7 @@ METHOD(job_t, execute, void,
 
 		charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
 	}
-	_destroy(this);
+	destroy(this);
 }
 
 /*
diff --git a/src/libcharon/processing/jobs/delete_ike_sa_job.c b/src/libcharon/processing/jobs/delete_ike_sa_job.c
index 1d86a992e1..da3ecf06f9 100644
--- a/src/libcharon/processing/jobs/delete_ike_sa_job.c
+++ b/src/libcharon/processing/jobs/delete_ike_sa_job.c
@@ -89,7 +89,7 @@ METHOD(job_t, execute, void,
 			}
 		}
 	}
-	_destroy(this);
+	destroy(this);
 }
 
 /*
diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
index 9ffe9b039e..5dda18be2b 100644
--- a/src/libcharon/processing/jobs/start_action_job.c
+++ b/src/libcharon/processing/jobs/start_action_job.c
@@ -78,7 +78,7 @@ METHOD(job_t, execute, void,
 		children->destroy(children);
 	}
 	enumerator->destroy(enumerator);
-	free(this);
+	destroy(this);
 }
 
 /*