Migrated process_message_job_t to INIT/METHOD macros

This commit is contained in:
Andreas Steffen
2011-02-10 08:09:36 +01:00
parent 8125dcca59
commit 76331a6493
@@ -35,19 +35,15 @@ struct private_process_message_job_t {
message_t *message; message_t *message;
}; };
/** METHOD(job_t, destroy, void,
* Implements job_t.destroy. private_process_message_job_t *this)
*/
static void destroy(private_process_message_job_t *this)
{ {
this->message->destroy(this->message); this->message->destroy(this->message);
free(this); free(this);
} }
/** METHOD(job_t, execute, void,
* Implementation of job_t.execute. private_process_message_job_t *this)
*/
static void execute(private_process_message_job_t *this)
{ {
ike_sa_t *ike_sa; ike_sa_t *ike_sa;
@@ -93,14 +89,17 @@ static void execute(private_process_message_job_t *this)
*/ */
process_message_job_t *process_message_job_create(message_t *message) process_message_job_t *process_message_job_create(message_t *message)
{ {
private_process_message_job_t *this = malloc_thing(private_process_message_job_t); private_process_message_job_t *this;
/* interface functions */ INIT(this,
this->public.job_interface.execute = (void (*) (job_t *)) execute; .public = {
this->public.job_interface.destroy = (void(*)(job_t*))destroy; .job_interface = {
.execute = _execute,
/* private variables */ .destroy = _destroy,
this->message = message; },
},
.message = message,
);
return &(this->public); return &(this->public);
} }