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

Migrated stroke_list_t to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2010-12-24 14:29:09 +01:00
parent d77c6c49a9
commit cb6be85cfe
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_list.c
+19 -23
View File
@@ -388,10 +388,8 @@ static void log_auth_cfgs(FILE *out, peer_cfg_t *peer_cfg, bool local)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
} }
/** METHOD(stroke_list_t, status, void,
* Implementation of stroke_list_t.status. private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bool all)
*/
static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bool all)
{ {
enumerator_t *enumerator, *children; enumerator_t *enumerator, *children;
ike_cfg_t *ike_cfg; ike_cfg_t *ike_cfg;
@@ -1133,10 +1131,8 @@ static void list_algs(FILE *out)
fprintf(out, "\n"); fprintf(out, "\n");
} }
/** METHOD(stroke_list_t, list, void,
* Implementation of stroke_list_t.list. private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
*/
static void list(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
{ {
linked_list_t *cert_list = NULL; linked_list_t *cert_list = NULL;
@@ -1239,10 +1235,8 @@ static void pool_leases(private_stroke_list_t *this, FILE *out, char *pool,
} }
} }
/** METHOD(stroke_list_t, leases, void,
* Implementation of stroke_list_t.leases private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
*/
static void leases(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
u_int size, offline, online; u_int size, offline, online;
@@ -1279,10 +1273,8 @@ static void leases(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
DESTROY_IF(address); DESTROY_IF(address);
} }
/** METHOD(stroke_list_t, destroy, void,
* Implementation of stroke_list_t.destroy private_stroke_list_t *this)
*/
static void destroy(private_stroke_list_t *this)
{ {
free(this); free(this);
} }
@@ -1292,15 +1284,19 @@ static void destroy(private_stroke_list_t *this)
*/ */
stroke_list_t *stroke_list_create(stroke_attribute_t *attribute) stroke_list_t *stroke_list_create(stroke_attribute_t *attribute)
{ {
private_stroke_list_t *this = malloc_thing(private_stroke_list_t); private_stroke_list_t *this;
this->public.list = (void(*)(stroke_list_t*, stroke_msg_t *msg, FILE *out))list; INIT(this,
this->public.status = (void(*)(stroke_list_t*, stroke_msg_t *msg, FILE *out,bool))status; .public = {
this->public.leases = (void(*)(stroke_list_t*, stroke_msg_t *msg, FILE *out))leases;
this->public.destroy = (void(*)(stroke_list_t*))destroy;
this->uptime = time_monotonic(NULL); .list = _list,
this->attribute = attribute; .status = _status,
.leases = _leases,
.destroy = _destroy,
},
.uptime = time_monotonic(NULL),
.attribute = attribute,
);
return &this->public; return &this->public;
} }