From 3ced86840c738f8e91c90a1cb453b0ac240abc1e Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 4 Oct 2011 10:49:33 +0200 Subject: Migrated user_controller_t to INIT/METHOD macros. --- src/medsrv/controller/user_controller.c | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/medsrv/controller/user_controller.c') diff --git a/src/medsrv/controller/user_controller.c b/src/medsrv/controller/user_controller.c index 6e1b7a249..12bd938fe 100755 --- a/src/medsrv/controller/user_controller.c +++ b/src/medsrv/controller/user_controller.c @@ -293,18 +293,15 @@ static void edit(private_user_controller_t *this, request_t *request) request->render(request, "templates/user/edit.cs"); } -/** - * Implementation of controller_t.get_name - */ -static char* get_name(private_user_controller_t *this) +METHOD(controller_t, get_name, char*, + private_user_controller_t *this) { return "user"; } -/** - * Implementation of controller_t.handle - */ -static void handle(private_user_controller_t *this, request_t *request, char *action) +METHOD(controller_t, handle, void, + private_user_controller_t *this, request_t *request, char *action, + char *p2, char *p3, char *p4, char *p5) { if (action) { @@ -332,10 +329,8 @@ static void handle(private_user_controller_t *this, request_t *request, char *ac request->redirect(request, "user/login"); } -/** - * Implementation of controller_t.destroy - */ -static void destroy(private_user_controller_t *this) +METHOD(controller_t, destroy, void, + private_user_controller_t *this) { free(this); } @@ -345,16 +340,21 @@ static void destroy(private_user_controller_t *this) */ controller_t *user_controller_create(user_t *user, database_t *db) { - private_user_controller_t *this= malloc_thing(private_user_controller_t); - - this->public.controller.get_name = (char*(*)(controller_t*))get_name; - this->public.controller.handle = (void(*)(controller_t*, request_t*, char*, char*, char*, char*, char*))handle; - this->public.controller.destroy = (void(*)(controller_t*))destroy; - - this->user = user; - this->db = db; - this->password_length = lib->settings->get_int(lib->settings, - "medsrv.password_length", 6); + private_user_controller_t *this; + + INIT(this, + .public = { + .controller = { + .get_name = _get_name, + .handle = _handle, + .destroy = _destroy, + }, + }, + .user = user, + .db = db, + .password_length = lib->settings->get_int(lib->settings, + "medsrv.password_length", 6), + ); return &this->public.controller; } -- cgit v1.2.3