_ prefix not required

diff --git a/src/libcharon/processing/jobs/acquire_job.c b/src/libcharon/processing/jobs/acquire_job.c
index e969b64..3544dd3 100644 (file)
--- 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 5a1fb94..29122cd 100644 (file)
--- 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 1d86a99..da3ecf0 100644 (file)
--- 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 9ffe9b0..5dda18b 100644 (file)
--- 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);
 }
 
 /*