소스 검색

quorum.h (quorum_set_quorate_fn_t): s/int/size_t/

propagate the change:
* include/corosync/engine/quorum.h (quorum_set_quorate_fn_t):
* exec/vsf_quorum.c (quorum_view_list_entries):
(quorum_api_set_quorum, quorum_exec_init_fn):
* exec/vsf_ykd.c (ykd_primary_callback_fn):

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2021 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering 17 년 전
부모
커밋
4cb431fc54
3개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 4 5
      exec/vsf_quorum.c
  2. 1 1
      exec/vsf_ykd.c
  3. 3 2
      include/corosync/engine/quorum.h

+ 4 - 5
exec/vsf_quorum.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
  *
  *
  * All rights reserved.
  * All rights reserved.
  *
  *
@@ -95,7 +95,7 @@ static struct corosync_api_v1 *corosync_api;
 static struct list_head lib_trackers_list;
 static struct list_head lib_trackers_list;
 static struct list_head internal_trackers_list;
 static struct list_head internal_trackers_list;
 static struct memb_ring_id quorum_ring_id;
 static struct memb_ring_id quorum_ring_id;
-static int quorum_view_list_entries = 0;
+static size_t quorum_view_list_entries = 0;
 static int quorum_view_list[PROCESSOR_COUNT_MAX];
 static int quorum_view_list[PROCESSOR_COUNT_MAX];
 struct quorum_services_api_ver1 *quorum_iface = NULL;
 struct quorum_services_api_ver1 *quorum_iface = NULL;
 
 
@@ -107,7 +107,7 @@ static void (*sync_primary_callback_fn) (
 
 
 /* Internal quorum API function */
 /* Internal quorum API function */
 static void quorum_api_set_quorum(unsigned int *view_list,
 static void quorum_api_set_quorum(unsigned int *view_list,
-				  int view_list_entries,
+				  size_t view_list_entries,
 				  int quorum, struct memb_ring_id *ring_id)
 				  int quorum, struct memb_ring_id *ring_id)
 {
 {
 	primary_designated = quorum;
 	primary_designated = quorum;
@@ -308,7 +308,7 @@ static int quorum_exec_init_fn (struct corosync_api_v1 *api)
 	}
 	}
 	if (!quorum_iface) {
 	if (!quorum_iface) {
 		/*
 		/*
-                 * With no quorum provider, we are always quorate 
+                 * With no quorum provider, we are always quorate
                  */
                  */
 		primary_designated = 1;
 		primary_designated = 1;
 	}
 	}
@@ -468,4 +468,3 @@ static void message_handler_req_lib_quorum_trackstop (void *conn, void *msg)
 	res.error = CS_OK;
 	res.error = CS_OK;
 	corosync_api->ipc_response_send(conn, &res, sizeof(mar_res_header_t));
 	corosync_api->ipc_response_send(conn, &res, sizeof(mar_res_header_t));
 }
 }
-

+ 1 - 1
exec/vsf_ykd.c

@@ -146,7 +146,7 @@ static struct corosync_api_v1 *api;
 
 
 static void (*ykd_primary_callback_fn) (
 static void (*ykd_primary_callback_fn) (
 	unsigned int *view_list,
 	unsigned int *view_list,
-	int view_list_entries,
+	size_t view_list_entries,
 	int primary_designated,
 	int primary_designated,
 	struct memb_ring_id *ring_id) = NULL;
 	struct memb_ring_id *ring_id) = NULL;
 
 

+ 3 - 2
include/corosync/engine/quorum.h

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
  *
  *
  * All rights reserved.
  * All rights reserved.
  *
  *
@@ -35,7 +35,8 @@
 #ifndef QUORUM_H_DEFINED
 #ifndef QUORUM_H_DEFINED
 #define QUORUM_H_DEFINED
 #define QUORUM_H_DEFINED
 
 
-typedef void (*quorum_set_quorate_fn_t) (unsigned int *view_list, int view_list_entries,
+typedef void (*quorum_set_quorate_fn_t) (unsigned int *view_list,
+					 size_t view_list_entries,
 					 int quorate, struct memb_ring_id *);
 					 int quorate, struct memb_ring_id *);
 
 
 struct quorum_services_api_ver1 {
 struct quorum_services_api_ver1 {