Use a seperate section for each nested struct member in INIT macro

2010-08-18 12:15:03 +02:00
parent 53115857ae
commit ba31fe1fd6
77 changed files with 615 additions and 448 deletions
@@ -157,7 +157,7 @@ eap_identity_t *eap_identity_create_peer(identification_t *server,

 	INIT(this,
 		.public =  {
-			.eap_method_interface = {
+			.eap_method = {
 				.initiate = _initiate_peer,
 				.process = _process_peer,
 				.get_type = _get_type,
@@ -182,13 +182,15 @@ eap_identity_t *eap_identity_create_server(identification_t *server,
 	private_eap_identity_t *this;

 	INIT(this,
-		.public.eap_method_interface = {
-			.initiate = _initiate_server,
-			.process = _process_server,
-			.get_type = _get_type,
-			.is_mutual = _is_mutual,
-			.get_msk = _get_msk,
-			.destroy = _destroy,
+		.public = {
+			.eap_method = {
+				.initiate = _initiate_server,
+				.process = _process_server,
+				.get_type = _get_type,
+				.is_mutual = _is_mutual,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.peer = peer->clone(peer),
 		.identity = chunk_empty,
@@ -33,7 +33,7 @@ struct eap_identity_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };

 /**