From ba31fe1fd65feba781434ee4fabd9b1fd6432ecb Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 18 Aug 2010 12:15:03 +0200 Subject: Use a seperate section for each nested struct member in INIT macro --- .../sa/authenticators/eap_authenticator.c | 26 ++++++---------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'src/libcharon/sa/authenticators/eap_authenticator.c') diff --git a/src/libcharon/sa/authenticators/eap_authenticator.c b/src/libcharon/sa/authenticators/eap_authenticator.c index 23105f640..0a2cb658c 100644 --- a/src/libcharon/sa/authenticators/eap_authenticator.c +++ b/src/libcharon/sa/authenticators/eap_authenticator.c @@ -652,13 +652,6 @@ eap_authenticator_t *eap_authenticator_create_builder(ike_sa_t *ike_sa, .received_nonce = received_nonce, .sent_init = sent_init, .sent_nonce = sent_nonce, - .msk = chunk_empty, - .method = NULL, - .eap_payload = NULL, - .eap_complete = FALSE, - .auth_complete = FALSE, - .eap_identity = NULL, - .require_mutual = FALSE, ); return &this->public; @@ -674,24 +667,19 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa, private_eap_authenticator_t *this; INIT(this, - .public.authenticator = { - .build = _build_server, - .process = _process_server, - .is_mutual = _is_mutual, - .destroy = _destroy, + .public = { + .authenticator = { + .build = _build_server, + .process = _process_server, + .is_mutual = _is_mutual, + .destroy = _destroy, + }, }, .ike_sa = ike_sa, .received_init = received_init, .received_nonce = received_nonce, .sent_init = sent_init, .sent_nonce = sent_nonce, - .msk = chunk_empty, - .method = NULL, - .eap_payload = NULL, - .eap_complete = FALSE, - .auth_complete = FALSE, - .eap_identity = NULL, - .require_mutual = FALSE, ); return &this->public; -- cgit v1.2.3