some simplifications using the INIT macro

src/libcharon/plugins/eap_identity/eap_identity.c

@@ -182,15 +182,13 @@ eap_identity_t *eap_identity_create_server(identification_t *server,
 	private_eap_identity_t *this;
 
 	INIT(this,
-		.public =  {
+		.public.eap_method_interface = {
-			.eap_method_interface = {
+			.initiate = _initiate_server,
-				.initiate = _initiate_server,
+			.process = _process_server,
-				.process = _process_server,
+			.get_type = _get_type,
-				.get_type = _get_type,
+			.is_mutual = _is_mutual,
-				.is_mutual = _is_mutual,
+			.get_msk = _get_msk,
-				.get_msk = _get_msk,
+			.destroy = _destroy,
-				.destroy = _destroy,
-			},
 		},
 		.peer = peer->clone(peer),
 		.identity = chunk_empty,

src/libcharon/plugins/eap_md5/eap_md5.c

@@ -267,15 +267,13 @@ eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer)
 	private_eap_md5_t *this;
 
 	INIT(this,
-		.public = {
+		.public.eap_method_interface = {
-			.eap_method_interface = {
+			.initiate = _initiate_peer,
-				.initiate = _initiate_peer,
+			.process = _process_peer,
-				.process = _process_peer,
+			.get_type = _get_type,
-				.get_type = _get_type,
+			.is_mutual = _is_mutual,
-				.is_mutual = _is_mutual,
+			.get_msk = _get_msk,
-				.get_msk = _get_msk,
+			.destroy = _destroy,
-				.destroy = _destroy,
-			},
 		},
 		.peer = peer->clone(peer),
 		.server = server->clone(server),

src/libcharon/sa/authenticators/eap_authenticator.c

@@ -674,13 +674,11 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa,
 	private_eap_authenticator_t *this;
 
 	INIT(this,
-		.public = {
+		.public.authenticator = {
-			.authenticator = {
+			.build = _build_server,
-				.build = _build_server,
+			.process = _process_server,
-				.process = _process_server,
+			.is_mutual = _is_mutual,
-				.is_mutual = _is_mutual,
+			.destroy = _destroy,
-				.destroy = _destroy,
-			},
 		},
 		.ike_sa = ike_sa,
 		.received_init = received_init,