Migrated uci_control_t to INIT/METHOD macros.

This commit is contained in:
Tobias Brunner
2011-10-04 12:12:04 +02:00
parent 3c6f06a7d4
commit e751bc9aab
+8 -6
View File
@@ -266,10 +266,8 @@ static job_requeue_t receive(private_uci_control_t *this)
return JOB_REQUEUE_FAIR; return JOB_REQUEUE_FAIR;
} }
/** METHOD(uci_control_t, destroy, void,
* Implementation of uci_control_t.destroy private_uci_control_t *this)
*/
static void destroy(private_uci_control_t *this)
{ {
this->job->cancel(this->job); this->job->cancel(this->job);
unlink(FIFO_FILE); unlink(FIFO_FILE);
@@ -281,9 +279,13 @@ static void destroy(private_uci_control_t *this)
*/ */
uci_control_t *uci_control_create() uci_control_t *uci_control_create()
{ {
private_uci_control_t *this = malloc_thing(private_uci_control_t); private_uci_control_t *this;
this->public.destroy = (void(*)(uci_control_t*))destroy; INIT(this,
.public = {
.destroy = _destroy,
},
);
unlink(FIFO_FILE); unlink(FIFO_FILE);
if (mkfifo(FIFO_FILE, S_IRUSR|S_IWUSR) != 0) if (mkfifo(FIFO_FILE, S_IRUSR|S_IWUSR) != 0)