aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-04-15 09:28:27 +0200
committerMartin Willi <martin@revosec.ch>2011-04-15 10:07:13 +0200
commit00b4b4b0d1a5b40563dda5c46cb31bd28641e0e1 (patch)
tree3ade8474fe39ef9d94855d08de6ea8d3acc1041d /src
parentf0331baf1a7f28846bb34011c528e7907972004d (diff)
downloadstrongswan-00b4b4b0d1a5b40563dda5c46cb31bd28641e0e1.tar.bz2
strongswan-00b4b4b0d1a5b40563dda5c46cb31bd28641e0e1.tar.xz
Migrated attr plugin to INIT/METHOD macros
Diffstat (limited to 'src')
-rw-r--r--src/libhydra/plugins/attr/attr_provider.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c
index b3c0cc076..d9c8f2e11 100644
--- a/src/libhydra/plugins/attr/attr_provider.c
+++ b/src/libhydra/plugins/attr/attr_provider.c
@@ -61,11 +61,9 @@ static bool attr_enum_filter(void *null, attribute_entry_t **in,
return TRUE;
}
-/**
- * Implementation of attribute_provider_t.create_attribute_enumerator
- */
-static enumerator_t* create_attribute_enumerator(private_attr_provider_t *this,
- char *pool, identification_t *id, host_t *vip)
+METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*,
+ private_attr_provider_t *this, char *pool,
+ identification_t *id, host_t *vip)
{
if (vip)
{
@@ -76,10 +74,8 @@ static enumerator_t* create_attribute_enumerator(private_attr_provider_t *this,
return enumerator_create_empty();
}
-/**
- * Implementation of attr_provider_t.destroy
- */
-static void destroy(private_attr_provider_t *this)
+METHOD(attr_provider_t, destroy, void,
+ private_attr_provider_t *this)
{
attribute_entry_t *entry;
@@ -246,14 +242,17 @@ attr_provider_t *attr_provider_create(database_t *db)
private_attr_provider_t *this;
int i;
- this = malloc_thing(private_attr_provider_t);
-
- this->public.provider.acquire_address = (host_t*(*)(attribute_provider_t *this, char*, identification_t *, host_t *))return_null;
- this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *, identification_t*))return_false;
- this->public.provider.create_attribute_enumerator = (enumerator_t*(*)(attribute_provider_t*, char *names, identification_t *id, host_t *vip))create_attribute_enumerator;
- this->public.destroy = (void(*)(attr_provider_t*))destroy;
-
- this->attributes = linked_list_create();
+ INIT(this,
+ .public = {
+ .provider = {
+ .acquire_address = (void*)return_null,
+ .release_address = (void*)return_false,
+ .create_attribute_enumerator = _create_attribute_enumerator,
+ },
+ .destroy = _destroy,
+ },
+ .attributes = linked_list_create(),
+ );
for (i = 1; i <= SERVER_MAX; i++)
{