From 890f20989f0535bb2af761821a3682c957bfeff7 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 17 Jul 2013 11:50:45 +0200 Subject: libfast: add a fast_ prefix to all classes, avoiding namespace clashes --- src/manager/controller/ikesa_controller.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/manager/controller/ikesa_controller.c') diff --git a/src/manager/controller/ikesa_controller.c b/src/manager/controller/ikesa_controller.c index 716d51a7a..df0e5f475 100644 --- a/src/manager/controller/ikesa_controller.c +++ b/src/manager/controller/ikesa_controller.c @@ -44,7 +44,7 @@ struct private_ikesa_controller_t { * read XML of a childsa element and fill template */ static void process_childsa(private_ikesa_controller_t *this, char *id, - enumerator_t *e, request_t *r) + enumerator_t *e, fast_request_t *r) { xml_t *xml; enumerator_t *e1, *e2; @@ -96,7 +96,7 @@ static void process_childsa(private_ikesa_controller_t *this, char *id, * read XML of a ikesa element and fill template */ static void process_ikesa(private_ikesa_controller_t *this, - enumerator_t *e, request_t *r) + enumerator_t *e, fast_request_t *r) { xml_t *xml; enumerator_t *e1, *e2; @@ -139,7 +139,7 @@ static void process_ikesa(private_ikesa_controller_t *this, } } -static void list(private_ikesa_controller_t *this, request_t *r) +static void list(private_ikesa_controller_t *this, fast_request_t *r) { gateway_t *gateway; xml_t *xml; @@ -173,14 +173,14 @@ static void list(private_ikesa_controller_t *this, request_t *r) } } -METHOD(controller_t, get_name, char*, +METHOD(fast_controller_t, get_name, char*, private_ikesa_controller_t *this) { return "ikesa"; } -METHOD(controller_t, handle, void, - private_ikesa_controller_t *this, request_t *request, char *action, +METHOD(fast_controller_t, handle, void, + private_ikesa_controller_t *this, fast_request_t *request, char *action, char *p2, char *p3, char *p4, char *p5) { if (!this->manager->logged_in(this->manager)) @@ -201,7 +201,7 @@ METHOD(controller_t, handle, void, return request->redirect(request, "ikesa/list"); } -METHOD(controller_t, destroy, void, +METHOD(fast_controller_t, destroy, void, private_ikesa_controller_t *this) { free(this); @@ -210,7 +210,7 @@ METHOD(controller_t, destroy, void, /* * see header file */ -controller_t *ikesa_controller_create(context_t *context, void *param) +fast_controller_t *ikesa_controller_create(fast_context_t *context, void *param) { private_ikesa_controller_t *this; @@ -227,4 +227,3 @@ controller_t *ikesa_controller_create(context_t *context, void *param) return &this->public.controller; } - -- cgit v1.2.3