denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated user_controller_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 10:49:33 +02:00
parent acf058251d
commit 3ced86840c
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/medsrv/controller/user_controller.c
+21 -21
View File
@@ -293,18 +293,15 @@ static void edit(private_user_controller_t *this, request_t *request)
request->render(request, "templates/user/edit.cs"); request->render(request, "templates/user/edit.cs");
} }
/** METHOD(controller_t, get_name, char*,
* Implementation of controller_t.get_name private_user_controller_t *this)
*/
static char* get_name(private_user_controller_t *this)
{ {
return "user"; return "user";
} }
/** METHOD(controller_t, handle, void,
* Implementation of controller_t.handle private_user_controller_t *this, request_t *request, char *action,
*/ char *p2, char *p3, char *p4, char *p5)
static void handle(private_user_controller_t *this, request_t *request, char *action)
{ {
if (action) if (action)
{ {
@@ -332,10 +329,8 @@ static void handle(private_user_controller_t *this, request_t *request, char *ac
request->redirect(request, "user/login"); request->redirect(request, "user/login");
} }
/** METHOD(controller_t, destroy, void,
* Implementation of controller_t.destroy private_user_controller_t *this)
*/
static void destroy(private_user_controller_t *this)
{ {
free(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) controller_t *user_controller_create(user_t *user, database_t *db)
{ {
private_user_controller_t *this= malloc_thing(private_user_controller_t); private_user_controller_t *this;
this->public.controller.get_name = (char*(*)(controller_t*))get_name; INIT(this,
this->public.controller.handle = (void(*)(controller_t*, request_t*, char*, char*, char*, char*, char*))handle; .public = {
this->public.controller.destroy = (void(*)(controller_t*))destroy; .controller = {
.get_name = _get_name,
this->user = user; .handle = _handle,
this->db = db; .destroy = _destroy,
this->password_length = lib->settings->get_int(lib->settings, },
"medsrv.password_length", 6); },
.user = user,
.db = db,
.password_length = lib->settings->get_int(lib->settings,
"medsrv.password_length", 6),
);
return &this->public.controller; return &this->public.controller;
} }