defect 478 - remove extra parameter to config change.

(Logical change 1.174)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@590 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/amf.c

@@ -237,12 +237,9 @@ static void amf_confchg_njoin (
 
 static int amf_confchg_fn (
 	enum totem_configuration_type configuration_type,
-    struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-    struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-    struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+    struct in_addr *member_list, int member_list_entries,
+    struct in_addr *left_list, int left_list_entries,
+    struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id);
 
 /***
@@ -1918,12 +1915,9 @@ void amf_confchg_nleave (struct saAmfComponent *component ,void *data)
 
 static int amf_confchg_fn (
 	enum totem_configuration_type configuration_type,
-    struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-    struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-    struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+    struct in_addr *member_list, int member_list_entries,
+    struct in_addr *left_list, int left_list_entries,
+    struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
 	int i;

exec/ckpt.c

@@ -177,12 +177,9 @@ static struct memb_ring_id saved_ring_id;
 
 static int ckpt_confchg_fn(
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private,
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id);
 
 struct libais_handler ckpt_libais_handlers[] =
@@ -781,12 +778,9 @@ static void ckpt_recovery_process_members_exit(struct in_addr *left_list, int le
 
 static int ckpt_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-	struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-	struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+	struct in_addr *member_list, int member_list_entries,
+	struct in_addr *left_list, int left_list_entries,
+	struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id) 
 {
 

exec/clm.c

@@ -100,12 +100,9 @@ static int clm_exec_init_fn (void);
 
 static int clm_confchg_fn (
 	enum totem_configuration_type configuration_type,
-    struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-    struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-    struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+    struct in_addr *member_list, int member_list_entries,
+    struct in_addr *left_list, int left_list_entries,
+    struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id);
 
 static void clm_sync_init (void);
@@ -393,12 +390,9 @@ static int clm_nodejoin_send (void)
 
 static int clm_confchg_fn (
 	enum totem_configuration_type configuration_type,
-    struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-    struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-    struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+    struct in_addr *member_list, int member_list_entries,
+    struct in_addr *left_list, int left_list_entries,
+    struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
 

exec/evs.c

@@ -71,12 +71,9 @@ static int evs_executive_initialize (void);
 
 static int evs_confchg_fn (
 	enum totem_configuration_type configuration_type,
-    struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-    struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-    struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+    struct in_addr *member_list, int member_list_entries,
+    struct in_addr *left_list, int left_list_entries,
+    struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id);
 
 static int message_handler_req_exec_mcast (void *message, struct in_addr source_addr, int endian_conversion_required);
@@ -157,12 +154,9 @@ static int evs_exit_fn (struct conn_info *conn_info)
 
 static int evs_confchg_fn (
 	enum totem_configuration_type configuration_type,
-    struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-    struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-    struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+    struct in_addr *member_list, int member_list_entries,
+    struct in_addr *left_list, int left_list_entries,
+    struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
 

exec/evt.c

@@ -83,12 +83,9 @@ static int lib_evt_event_data_get(struct conn_info *conn_info,
 
 static int evt_conf_change(
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private,
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id);
 
 static int evt_initialize(struct conn_info *conn_info, void *msg);
@@ -2701,12 +2698,9 @@ static void remove_chan_open_info(SaClmNodeIdT node_id)
  */
 static int evt_conf_change(
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private,
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id)
 {
 	log_printf(RECOVERY_DEBUG, "Evt conf change %d\n", 

exec/handlers.h

@@ -58,12 +58,9 @@ struct service_handler {
 	int aisexec_handler_fns_count;
 	int (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private,
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id);
 	int (*libais_init_fn) (struct conn_info *conn_info, void *msg);
 	int (*libais_exit_fn) (struct conn_info *conn_info);

exec/main.c

@@ -739,7 +739,7 @@ static void deliver_fn (
 		header->size = swab32 (header->size);
 	}
 
-	assert(iovec->iov_len == header->size);
+//	assert(iovec->iov_len == header->size);
 
 	res = aisexec_handler_fns[header->id](header, source_addr,
 		endian_conversion_required);
@@ -747,12 +747,9 @@ static void deliver_fn (
 
 static void confchg_fn (
 	enum totem_configuration_type configuration_type,
-	struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-	struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-	struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+	struct in_addr *member_list, int member_list_entries,
+	struct in_addr *left_list, int left_list_entries,
+	struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
 	int i;
@@ -765,9 +762,9 @@ static void confchg_fn (
 	 * Execute configuration change for synchronization service
 	 */
 	sync_confchg_fn (configuration_type,
-		member_list, member_list_private, member_list_entries,
-		left_list, left_list_private, left_list_entries,
-		joined_list, joined_list_private, joined_list_entries, ring_id);
+		member_list, member_list_entries,
+		left_list, left_list_entries,
+		joined_list, joined_list_entries, ring_id);
 
 	/*
 	 * Call configuration change for all services
@@ -775,9 +772,9 @@ static void confchg_fn (
 	for (i = 0; i < AIS_SERVICE_HANDLERS_COUNT; i++) {
 		if (ais_service_handlers[i]->confchg_fn) {
 			ais_service_handlers[i]->confchg_fn (configuration_type,
-				member_list, member_list_private, member_list_entries,
-				left_list, left_list_private, left_list_entries,
-				joined_list, joined_list_private, joined_list_entries, ring_id);
+				member_list, member_list_entries,
+				left_list, left_list_entries,
+				joined_list, joined_list_entries, ring_id);
 		}
 	}
 }

exec/sync.c

@@ -164,12 +164,9 @@ void sync_register (struct sync_callbacks *callbacks, int callback_count,
 
 void sync_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-	struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-	struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+	struct in_addr *member_list, int member_list_entries,
+	struct in_addr *left_list, int left_list_entries,
+	struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
 	int i;

exec/sync.h

@@ -51,12 +51,9 @@ void sync_register (struct sync_callbacks *callbacks, int callback_count,
 
 void sync_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-	struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-	struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+	struct in_addr *member_list, int member_list_entries,
+	struct in_addr *left_list, int left_list_entries,
+	struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id);
 
 int sync_deliver_fn (void *msg, struct in_addr source_addr,

exec/totempg.c

@@ -144,12 +144,9 @@ static void (*app_deliver_fn) (
 
 static void (*app_confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private, 
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id) = 0;
 
 struct assembly {
@@ -191,12 +188,9 @@ static struct assembly *find_assembly (struct in_addr addr)
 
 static void totempg_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	struct in_addr *member_list, void *member_list_private, 
-		int member_list_entries,
-	struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-	struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+	struct in_addr *member_list, int member_list_entries,
+	struct in_addr *left_list, int left_list_entries,
+	struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
 	int i;
@@ -239,9 +233,10 @@ static void totempg_confchg_fn (
 	}
 
 	app_confchg_fn (configuration_type,
-		member_list, member_list_private, member_list_entries,
-		left_list, left_list_private, left_list_entries,
-		joined_list, joined_list_private, joined_list_entries, ring_id);
+		member_list, member_list_entries,
+		left_list, left_list_entries,
+		joined_list, joined_list_entries,
+		ring_id);
 }
 
 static void totempg_deliver_fn (
@@ -454,12 +449,9 @@ int totempg_initialize (
 		int endian_conversion_required),
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private, 
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id))
 {
 	int res;

exec/totempg.h

@@ -78,12 +78,9 @@ int totempg_initialize (
 		int endian_conversion_required),
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private, 
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id));
 
 /*

exec/totemsrp.c

@@ -423,12 +423,9 @@ void (*totemsrp_deliver_fn) (
 
 void (*totemsrp_confchg_fn) (
 	enum totem_configuration_type configuration_type,
-	struct in_addr *member_list, void *member_list_private,
-		int member_list_entries,
-	struct in_addr *left_list, void *left_list_private,
-		int left_list_entries,
-	struct in_addr *joined_list, void *joined_list_private,
-		int joined_list_entries,
+	struct in_addr *member_list, int member_list_entries,
+	struct in_addr *left_list, int left_list_entries,
+	struct in_addr *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id) = 0;
 
 static struct totem_interface *totemsrp_interfaces;
@@ -565,12 +562,9 @@ int totemsrp_initialize (
 		int endian_conversion_required),
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private,
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id))
 {
 
@@ -1041,9 +1035,9 @@ static void memb_state_operational_enter (void)
 	 * Deliver transitional configuration to application
 	 */
 	totemsrp_confchg_fn (TOTEM_CONFIGURATION_TRANSITIONAL,
-		my_trans_memb_list, 0, my_trans_memb_entries,
-		left_list, 0, left_list_entries,
-		0, 0, 0, &my_ring_id);
+		my_trans_memb_list, my_trans_memb_entries,
+		left_list, left_list_entries,
+		0, 0, &my_ring_id);
 		
 // TODO we need to filter to ensure we only deliver those
 // messages which are part of my_deliver_memb
@@ -1053,9 +1047,9 @@ static void memb_state_operational_enter (void)
 	 * Deliver regular configuration to application
 	 */
 	totemsrp_confchg_fn (TOTEM_CONFIGURATION_REGULAR,
-		my_new_memb_list, 0, my_new_memb_entries,
-		0, 0, 0,
-		joined_list, 0, joined_list_entries, &my_ring_id);
+		my_new_memb_list, my_new_memb_entries,
+		0, 0,
+		joined_list, joined_list_entries, &my_ring_id);
 
 	/*
 	 * Install new membership

exec/totemsrp.h

@@ -74,12 +74,9 @@ int totemsrp_initialize (
 		int endian_conversion_required),
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		struct in_addr *member_list, void *member_list_private, 
-			int member_list_entries,
-		struct in_addr *left_list, void *left_list_private,
-			int left_list_entries,
-		struct in_addr *joined_list, void *joined_list_private,
-			int joined_list_entries,
+		struct in_addr *member_list, int member_list_entries,
+		struct in_addr *left_list, int left_list_entries,
+		struct in_addr *joined_list, int joined_list_entries,
 		struct memb_ring_id *ring_id));
 
 /*