_ prefix not required

diff --git a/src/libcharon/processing/jobs/acquire_job.c b/src/libcharon/processing/jobs/acquire_job.c
index e969b648fe71b22669c9750da271fa93a8c8e94c..3544dd33276090505378c578c7eb70b6e323e644 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 5a1fb9420961865e1e3fde69d6b3491d527754e3..29122cd030066ad96683bccfec738c56c0e863a0 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 1d86a992e17dc094633d4fe7cb0b7d67a8da073b..da3ecf06f97a9c63101073877bb38cd3a7ca541b 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 9ffe9b039e31b9cbb74ba63cba2d9e6ec813e2d4..5dda18be2bff8e1ec6a772415dd665bfb5c15206 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);
 }
 
 /*