*_confchg_fn: make pointer params const, change *_entries to be size_t

* exec/main.c (confchg_fn):
* exec/quorum.h (sync_callback_fn_t):
* exec/sync.c (sync_ring_id, barrier_data_process)
(sync_start_init, sync_service_process, sync_primary_callback_fn)
(sync_deliver_fn, sync_confchg_fn):
* exec/sync.h (name):
* exec/totemmrp.c (totemsrp_handle_in, pg_confchg_fn)
(totemmrp_confchg_fn, totemmrp_initialize):
* exec/totemmrp.h (TOTEMMRP_H_DEFINED):
* exec/totempg.c (confchg_fn, totempg_confchg_fn)
(totempg_groups_initialize):
* include/corosync/engine/coroapi.h (tpg_init, confchg_fn)
(sync_abort):
* include/corosync/totem/totempg.h (TOTEMPG_SAFE):
* services/cfg.c (shutdown_reply, cfg_confchg_fn)
(message_handler_req_exec_cfg_ringreenable):
* services/cpg.c (api, cpg_confchg_fn):
* services/evs.c (MESSAGE_REQ_EXEC_EVS_MCAST, evs_confchg_fn):
* services/pload.c (MESSAGE_REQ_EXEC_PLOAD_MCAST)
(pload_confchg_fn):

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

exec/main.c

@@ -271,10 +271,10 @@ static struct memb_ring_id corosync_ring_id;
 
 static void confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 	int i;
 

exec/sync.c

@@ -7,7 +7,7 @@
  * Author: Steven Dake (sdake@redhat.com)
  *
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
@@ -70,7 +70,7 @@ struct barrier_data {
 	int completed;
 };
 
-static struct memb_ring_id *sync_ring_id;
+static const struct memb_ring_id *sync_ring_id;
 
 static int vsf_none = 0;
 
@@ -110,16 +110,16 @@ static void sync_deliver_fn (
 
 static void sync_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id);
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id);
 
 static void sync_primary_callback_fn (
-        unsigned int *view_list,
-        int view_list_entries,
+        const unsigned int *view_list,
+        size_t view_list_entries,
         int primary_designated,
-        struct memb_ring_id *ring_id);
+        const struct memb_ring_id *ring_id);
 
 
 static struct totempg_group sync_group = {
@@ -157,7 +157,7 @@ static int sync_barrier_send (struct memb_ring_id *ring_id)
 	return (res);
 }
 
-static void sync_start_init (struct memb_ring_id *ring_id)
+static void sync_start_init (const struct memb_ring_id *ring_id)
 {
 	totempg_callback_token_create (
 		&sync_callback_token_handle,
@@ -225,7 +225,7 @@ static int sync_service_process (enum totem_callback_token_type type, void *data
 	int res;
 	struct memb_ring_id *ring_id = (struct memb_ring_id *)data;
 
-	
+
 	/*
 	 * If process operation not from this ring id, then ignore it and stop
 	 * processing
@@ -233,7 +233,7 @@ static int sync_service_process (enum totem_callback_token_type type, void *data
 	if (memcmp (ring_id, sync_ring_id, sizeof (struct memb_ring_id)) != 0) {
 		return (0);
 	}
-	
+
 	/*
 	 * If process returns 0, then its time to activate
 	 * and start the next service's synchronization
@@ -284,7 +284,7 @@ static void sync_primary_callback_fn (
 	const unsigned int *view_list,
 	size_t view_list_entries,
 	int primary_designated,
-	struct memb_ring_id *ring_id)
+	const struct memb_ring_id *ring_id)
 {
 	int i;
 
@@ -372,7 +372,7 @@ log_printf (LOG_LEVEL_DEBUG, "confchg entries %d\n", barrier_data_confchg_entrie
 	 */
 	for (i = 0; i < barrier_data_confchg_entries; i++) {
 		log_printf (LOG_LEVEL_DEBUG,
-			"Barrier completion status for nodeid %d = %d. \n", 
+			"Barrier completion status for nodeid %d = %d. \n",
 			barrier_data_process[i].nodeid,
 			barrier_data_process[i].completed);
 		if (barrier_data_process[i].completed == 0) {
@@ -388,7 +388,7 @@ log_printf (LOG_LEVEL_DEBUG, "confchg entries %d\n", barrier_data_confchg_entrie
 	 */
 	if (barrier_completed && sync_callbacks.sync_activate) {
 		sync_callbacks.sync_activate ();
-	
+
 		log_printf (LOG_LEVEL_DEBUG,
 			"Committing synchronization for (%s)\n",
 			sync_callbacks.name);
@@ -418,10 +418,10 @@ log_printf (LOG_LEVEL_DEBUG, "confchg entries %d\n", barrier_data_confchg_entrie
 
 static void sync_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 	sync_ring_id = ring_id;
 

exec/totemmrp.c

@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2007 Red Hat, Inc.
+ * Copyright (c) 2006-2007, 2009 Red Hat, Inc.
  *
  * All rights reserved.
  *
  * Author: Steven Dake (sdake@redhat.com)
  *
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
@@ -74,10 +74,10 @@ void totemmrp_deliver_fn (
 
 void totemmrp_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id);
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id);
 
 void (*pg_deliver_fn) (
 	unsigned int nodeid,
@@ -87,10 +87,10 @@ void (*pg_deliver_fn) (
 
 void (*pg_confchg_fn) (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id) = 0;
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id) = 0;
 
 void totemmrp_deliver_fn (
 	unsigned int nodeid,
@@ -103,10 +103,10 @@ void totemmrp_deliver_fn (
 
 void totemmrp_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 	pg_confchg_fn (configuration_type,
 		member_list, member_list_entries,
@@ -129,10 +129,10 @@ int totemmrp_initialize (
 		int endian_conversion_required),
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		unsigned int *member_list, int member_list_entries,
-		unsigned int *left_list, int left_list_entries,
-		unsigned int *joined_list, int joined_list_entries,
-		struct memb_ring_id *ring_id))
+		const unsigned int *member_list, size_t member_list_entries,
+		const unsigned int *left_list, size_t left_list_entries,
+		const unsigned int *joined_list, size_t joined_list_entries,
+		const struct memb_ring_id *ring_id))
 {
 	int result;
 	pg_deliver_fn = deliver_fn;
@@ -229,4 +229,3 @@ extern int totemmrp_ring_reenable (void)
 
 	return (res);
 }
-

exec/totemmrp.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2007 Red Hat, Inc.
+ * Copyright (c) 2006-2007, 2009 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -66,10 +66,10 @@ extern int totemmrp_initialize (
 		int endian_conversion_required),
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		unsigned int *member_list, int member_list_entries,
-		unsigned int *left_list, int left_list_entries,
-		unsigned int *joined_list, int joined_list_entries,
-		struct memb_ring_id *ring_id));
+		const unsigned int *member_list, size_t member_list_entries,
+		const unsigned int *left_list, size_t left_list_entries,
+		const unsigned int *joined_list, size_t joined_list_entries,
+		const struct memb_ring_id *ring_id));
 
 extern void totemmrp_finalize (void);
 

exec/totempg.c

@@ -9,7 +9,7 @@
  * Author: Mark Haverkamp (markh@osdl.org)
  *
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
@@ -217,10 +217,10 @@ struct totempg_group_instance {
 
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		unsigned int *member_list, int member_list_entries,
-		unsigned int *left_list, int left_list_entries,
-		unsigned int *joined_list, int joined_list_entries,
-		struct memb_ring_id *ring_id);
+		const unsigned int *member_list, size_t member_list_entries,
+		const unsigned int *left_list, size_t left_list_entries,
+		const unsigned int *joined_list, size_t joined_list_entries,
+		const struct memb_ring_id *ring_id);
 
 	struct totempg_group *groups;
 
@@ -487,10 +487,10 @@ static inline void app_deliver_fn (
 
 static void totempg_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 // TODO optimize this
 	app_confchg_fn (configuration_type,
@@ -996,10 +996,10 @@ int totempg_groups_initialize (
 
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		unsigned int *member_list, int member_list_entries,
-		unsigned int *left_list, int left_list_entries,
-		unsigned int *joined_list, int joined_list_entries,
-		struct memb_ring_id *ring_id))
+		const unsigned int *member_list, size_t member_list_entries,
+		const unsigned int *left_list, size_t left_list_entries,
+		const unsigned int *joined_list, size_t joined_list_entries,
+		const struct memb_ring_id *ring_id))
 {
 	struct totempg_group_instance *instance;
 	unsigned int res;

include/corosync/engine/coroapi.h

@@ -449,10 +449,13 @@ struct corosync_api_v1 {
 
 		void (*confchg_fn) (
 			enum totem_configuration_type configuration_type,
-			unsigned int *member_list, int member_list_entries,
-			unsigned int *left_list, int left_list_entries,
-			unsigned int *joined_list, int joined_list_entries,
-			struct memb_ring_id *ring_id));
+			const unsigned int *member_list,
+			size_t member_list_entries,
+			const unsigned int *left_list,
+			size_t left_list_entries,
+			const unsigned int *joined_list,
+			size_t joined_list_entries,
+			const struct memb_ring_id *ring_id));
 
 	int (*tpg_exit) (
        		hdb_handle_t handle);
@@ -585,10 +588,10 @@ struct corosync_service_engine {
 	int (*config_init_fn) (struct corosync_api_v1 *);
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		unsigned int *member_list, int member_list_entries,
-		unsigned int *left_list, int left_list_entries,
-		unsigned int *joined_list, int joined_list_entries,
-		struct memb_ring_id *ring_id);
+		const unsigned int *member_list, size_t member_list_entries,
+		const unsigned int *left_list, size_t left_list_entries,
+		const unsigned int *joined_list, size_t joined_list_entries,
+		const struct memb_ring_id *ring_id);
 	void (*sync_init) (void);
 	int (*sync_process) (void);
 	void (*sync_activate) (void);
@@ -596,4 +599,3 @@ struct corosync_service_engine {
 };
 
 #endif /* COROAPI_H_DEFINED */
-	

include/corosync/totem/totempg.h

@@ -86,10 +86,10 @@ extern int totempg_groups_initialize (
 
 	void (*confchg_fn) (
 		enum totem_configuration_type configuration_type,
-		unsigned int *member_list, int member_list_entries,
-		unsigned int *left_list, int left_list_entries,
-		unsigned int *joined_list, int joined_list_entries,
-		struct memb_ring_id *ring_id));
+		const unsigned int *member_list, size_t member_list_entries,
+		const unsigned int *left_list, size_t left_list_entries,
+		const unsigned int *joined_list, size_t joined_list_entries,
+		const struct memb_ring_id *ring_id));
 
 extern int totempg_groups_finalize (
 	hdb_handle_t handle);

services/cfg.c

@@ -94,10 +94,10 @@ struct cfg_info
 
 static void cfg_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id);
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id);
 
 static int cfg_exec_init_fn (struct corosync_api_v1 *corosync_api_v1);
 
@@ -358,10 +358,10 @@ static int cfg_exec_init_fn (
 
 static void cfg_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 }
 
@@ -566,8 +566,8 @@ static void message_handler_req_exec_cfg_ringreenable (
         const void *message,
         unsigned int nodeid)
 {
-	struct req_exec_cfg_ringreenable *req_exec_cfg_ringreenable =
-		(struct req_exec_cfg_ringreenable *)message;
+	const struct req_exec_cfg_ringreenable *req_exec_cfg_ringreenable
+	  = message;
 	struct res_lib_cfg_ringreenable res_lib_cfg_ringreenable;
 
 	ENTER();

services/cpg.c

@@ -119,10 +119,10 @@ static struct corosync_api_v1 *api = NULL;
  */
 static void cpg_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id);
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id);
 
 static int cpg_exec_init_fn (struct corosync_api_v1 *);
 
@@ -630,10 +630,10 @@ static void remove_node_from_groups(
 
 static void cpg_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 	int i;
 	uint32_t lowest_nodeid = 0xffffffff;

services/evs.c

@@ -74,10 +74,10 @@ static int evs_exec_init_fn (
 
 static void evs_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id);
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id);
 
 static void message_handler_req_exec_mcast (const void *msg, unsigned int nodeid);
 
@@ -213,10 +213,10 @@ struct res_evs_confchg_callback res_evs_confchg_callback;
 
 static void evs_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 	struct list_head *list;
 	struct evs_pd *evs_pd;

services/pload.c

@@ -76,10 +76,10 @@ static int pload_exec_init_fn (
 
 static void pload_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id);
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id);
 
 static void message_handler_req_exec_pload_start (const void *msg,
 						  unsigned int nodeid);
@@ -215,10 +215,10 @@ static int pload_exec_init_fn (
 
 static void pload_confchg_fn (
 	enum totem_configuration_type configuration_type,
-	unsigned int *member_list, int member_list_entries,
-	unsigned int *left_list, int left_list_entries,
-	unsigned int *joined_list, int joined_list_entries,
-	struct memb_ring_id *ring_id)
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct memb_ring_id *ring_id)
 {
 }