Remove shadow warnings.

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

exec/coropoll.c

@@ -47,7 +47,7 @@
 #include <corosync/list.h>
 #include "tlist.h"
 
-typedef int (*dispatch_fn_t) (hdb_handle_t hdb_handle_t, int fd, int revents, void *data);
+typedef int (*dispatch_fn_t) (hdb_handle_t hdb_handle, int fd, int revents, void *data);
 
 struct poll_entry {
 	struct pollfd ufd;

exec/timer.h

@@ -54,9 +54,9 @@ extern int corosync_timer_add_absolute (
 	void (*timer_fn) (void *data),
 	corosync_timer_handle *handle);
 
-extern void corosync_timer_delete (corosync_timer_handle timer_handle);
+extern void corosync_timer_delete (corosync_timer_handle handle);
 
-extern void corosync_timer_delete_data (corosync_timer_handle timer_handle);
+extern void corosync_timer_delete_data (corosync_timer_handle handle);
 
 extern void corosync_timer_lock (void);
 
@@ -64,6 +64,6 @@ extern void corosync_timer_unlock (void);
 
 extern unsigned long long corosync_timer_time_get (void);
 
-extern unsigned long long corosync_timer_expire_time_get (corosync_timer_handle timer_handle);
+extern unsigned long long corosync_timer_expire_time_get (corosync_timer_handle handle);
 
 #endif /* TIMER_H_DEFINED */

exec/vsf_ykd.c

@@ -123,9 +123,9 @@ static int state_received_process_entries;
 
 static enum ykd_mode ykd_mode;
 
-static unsigned int view_list[YKD_PROCESSOR_COUNT_MAX];
+static unsigned int ykd_view_list[YKD_PROCESSOR_COUNT_MAX];
 
-static int view_list_entries;
+static int ykd_view_list_entries;
 
 static int session_id_max;
 
@@ -135,7 +135,7 @@ static struct ykd_session ambiguous_sessions_max[YKD_PROCESSOR_COUNT_MAX];
 
 static int ambiguous_sessions_max_entries;
 
-static int primary_designated = 0;
+static int ykd_primary_designated = 0;
 
 static struct memb_ring_id ykd_ring_id;
 
@@ -290,12 +290,12 @@ static int decide (void)
 	/*
 	 * Determine if there is a subquorum
 	 */
-	if (subquorum (view_list, view_list_entries, last_primary_max) == 0) {
+	if (subquorum (ykd_view_list, ykd_view_list_entries, last_primary_max) == 0) {
 		return (0);
 	}
 
 	for (i = 0; i < ambiguous_sessions_max_entries; i++) {
-		if (subquorum (view_list, view_list_entries, &ambiguous_sessions_max[i]) == 0) {
+		if (subquorum (ykd_view_list, ykd_view_list_entries, &ambiguous_sessions_max[i]) == 0) {
 			return (0);
 		}
 
@@ -355,8 +355,8 @@ static void ykd_deliver_fn (
 			primary_designated = 1;
 
 			ykd_primary_callback_fn (
-				view_list,
-				view_list_entries,
+				ykd_view_list,
+				ykd_view_list_entries,
 				primary_designated,
 				&ykd_ring_id);
 		return;
@@ -415,8 +415,8 @@ static void ykd_deliver_fn (
 				if (decide ()) {
 					ykd_state.session_id = session_id_max + 1;
 					memcpy (ykd_state.ambiguous_sessions[ykd_state.ambiguous_sessions_entries].member_list,
-						view_list, sizeof (unsigned int) * view_list_entries);
-						ykd_state.ambiguous_sessions[ykd_state.ambiguous_sessions_entries].member_list_entries = view_list_entries;
+						ykd_view_list, sizeof (unsigned int) * ykd_view_list_entries);
+						ykd_state.ambiguous_sessions[ykd_state.ambiguous_sessions_entries].member_list_entries = ykd_view_list_entries;
 						ykd_state.ambiguous_sessions_entries += 1;
 					ykd_attempt_send();
 				}
@@ -427,16 +427,16 @@ static void ykd_deliver_fn (
 			if (all_received) {
 				log_printf (LOGSYS_LEVEL_NOTICE,
 					"This processor is within the primary component.\n");
-				primary_designated = 1;
+				ykd_primary_designated = 1;
 
 				ykd_primary_callback_fn (
-					view_list,
-					view_list_entries,
-					primary_designated,
+					ykd_view_list,
+					ykd_view_list_entries,
+					ykd_primary_designated,
 					&ykd_ring_id);
 
-				memcpy (ykd_state.last_primary.member_list, view_list, sizeof (view_list));
-				ykd_state.last_primary.member_list_entries = view_list_entries;
+				memcpy (ykd_state.last_primary.member_list, ykd_view_list, sizeof (ykd_view_list));
+				ykd_state.last_primary.member_list_entries = ykd_view_list_entries;
 				ykd_state.last_primary.session_id = ykd_state.session_id;
 				ykd_state.ambiguous_sessions_entries = 0;
 			}
@@ -466,18 +466,18 @@ static void ykd_confchg_fn (
 		ykd_state.last_primary.session_id = 0;
 		first_run = 0;
 	}
-	memcpy (view_list, member_list,
+	memcpy (ykd_view_list, member_list,
 		member_list_entries * sizeof (unsigned int));
-	view_list_entries = member_list_entries;
+	ykd_view_list_entries = member_list_entries;
 
 	ykd_mode = YKD_MODE_SENDSTATE;
 
-	primary_designated = 0;
+	ykd_primary_designated = 0;
 
 	ykd_primary_callback_fn (
-		view_list,
-		view_list_entries,
-		primary_designated,
+		ykd_view_list,
+		ykd_view_list_entries,
+		ykd_primary_designated,
 		&ykd_ring_id);
 
 	memset (&state_received_confchg, 0, sizeof (state_received_confchg));

include/corosync/totem/coropoll.h

@@ -45,7 +45,7 @@ typedef void * poll_timer_handle;
 
 hdb_handle_t poll_create (void);
 
-int poll_destroy (hdb_handle_t hdb_handle_t);
+int poll_destroy (hdb_handle_t hdb_handle);
 
 int poll_dispatch_add (
 	hdb_handle_t handle,

services/votequorum.c

@@ -164,7 +164,7 @@ static void quorum_confchg_fn (
 	const unsigned int *joined_list, size_t joined_list_entries,
 	const struct memb_ring_id *ring_id);
 
-static int votequorum_exec_init_fn (struct corosync_api_v1 *corosync_api);
+static int votequorum_exec_init_fn (struct corosync_api_v1 *api);
 
 static int quorum_lib_init_fn (void *conn);