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

Migrated peer_controller_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 10:52:00 +02:00
parent 3ced86840c
commit 2b7f89b1fa
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/medsrv/controller/peer_controller.c
+19 -20
View File
@@ -312,19 +312,15 @@ static void delete(private_peer_controller_t *this, request_t *request, int id)
DB_INT, id, DB_UINT, this->user->get_user(this->user)); DB_INT, id, DB_UINT, this->user->get_user(this->user));
} }
/** METHOD(controller_t, get_name, char*,
* Implementation of controller_t.get_name private_peer_controller_t *this)
*/
static char* get_name(private_peer_controller_t *this)
{ {
return "peer"; return "peer";
} }
/** METHOD(controller_t, handle, void,
* Implementation of controller_t.handle private_peer_controller_t *this, request_t *request, char *action,
*/ char *idstr, char *p3, char *p4, char *p5)
static void handle(private_peer_controller_t *this, request_t *request,
char *action, char *idstr)
{ {
if (action) if (action)
{ {
@@ -354,10 +350,8 @@ static void handle(private_peer_controller_t *this, request_t *request,
request->redirect(request, "peer/list"); request->redirect(request, "peer/list");
} }
/** METHOD(controller_t, destroy, void,
* Implementation of controller_t.destroy private_peer_controller_t *this)
*/
static void destroy(private_peer_controller_t *this)
{ {
free(this); free(this);
} }
@@ -367,14 +361,19 @@ static void destroy(private_peer_controller_t *this)
*/ */
controller_t *peer_controller_create(user_t *user, database_t *db) controller_t *peer_controller_create(user_t *user, database_t *db)
{ {
private_peer_controller_t *this= malloc_thing(private_peer_controller_t); private_peer_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,
},
},
.user = user,
.db = db,
);
return &this->public.controller; return &this->public.controller;
} }