proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-24 20:05:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert all "int iov_len" decls to "unsigned int iov_len".

Browse Source 
Used this command:
git grep -l 'int iov_len' \
  | xargs perl -pi -e 's/((?:^|,)\s*)(int iov_len)/${1}unsigned $2/'

Here's an approximate (autogenerated by vc-chlog) list of affected
file names and functions/macros:
* README.devmap:
* exec/coroipcs.c (sending_allowed_private_data)
(coroipcs_response_iov_send, msg_send, msg_send_or_queue)
(coroipcs_dispatch_iov_send):
* exec/coroipcs.h (handler_fn_get):
* exec/main.c (deliver_fn, main_mcast):
* exec/main.h (FALSE):
* exec/sync.c (vsf_iface, sync_deliver_fn):
* exec/totemmrp.c (totemsrp_handle_in, pg_deliver_fn)
(totemmrp_deliver_fn, totemmrp_initialize, totemmrp_mcast):
* exec/totemmrp.h (TOTEMMRP_H_DEFINED):
* exec/totemnet.c (iov_len, encrypt_and_sign_worker)
(ucast_sendmsg, mcast_sendmsg, totemnet_token_send):
* exec/totemnet.h (TOTEMNET_FLUSH):
* exec/totempg.c (deliver_fn, totempg_deliver_fn, mcast_msg)
(totempg_groups_initialize, totempg_groups_mcast_joined)
(totempg_groups_joined_reserve):
* exec/totemsrp.c (iov_len, totemsrp_recv, totemsrp_deliver_fn)
(totemsrp_initialize, totemsrp_mcast, token_send):
* exec/totemsrp.h (TOTEMSRP_H_DEFINED):
* exec/vsf_ykd.c (ykd_deliver_fn):
* include/corosync/coroipcc.h (handleInstanceDestructor):
* include/corosync/cpg.h (cpg_callbacks_t):
* include/corosync/engine/coroapi.h (ipc_response_iov_send)
(ipc_dispatch_iov_send, totem_mcast, tpg_init, tpg_joined_mcast)
(tpg_joined_reserve, tpg_groups_mcast, tpg_groups_reserve):
* include/corosync/totem/totempg.h (TOTEMPG_SAFE):
* lib/coroipcc.c (coroipcc_msg_send)
(coroipcc_msg_send_reply_receive)
(coroipcc_msg_send_reply_receive_in_buf):
* lib/cpg.c (cpg_mcast_joined):
* lib/util.h (versionsSupported):
* services/pload.c (send_message):
* services/votequorum.c (conn, quorum_deliver_fn):

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2031 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Jim Meyering 2009-04-08 07:56:45 +00:00
parent 2eba2a6cb8
commit 36eefbadef
23 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.devmap
View File

@ -702,7 +702,7 @@ Messages are sent and received from the executive with the following functions:
SaAisErrorT saSendMsgRetry (
int s,
struct iovec *iov,
int iov_len);
unsigned int iov_len);
the s member is the socket to use retrieved with saServiceConnect
The iov is the iovector used to send a message.
@ -743,7 +743,7 @@ A message may be send and a reply waited for with the following function:
SaAisErrorT saSendMsgReceiveReply (
int s,
struct iovec *iov,
int iov_len,
unsigned int iov_len,
void *responseMessage,
int responseLen)

10
exec/coroipcs.c
View File

@ -140,7 +140,7 @@ static int priv_change (struct conn_info *conn_info);
static void ipc_disconnect (struct conn_info *conn_info);
static void msg_send (void *conn, const struct iovec *iov, int iov_len,
static void msg_send (void *conn, const struct iovec *iov, unsigned int iov_len,
int locked);
static int memcpy_dwrap (struct conn_info *conn_info, void *msg, int len);
@ -606,7 +606,7 @@ retry_semop:
return (0);
}
int coroipcs_response_iov_send (void *conn, const struct iovec *iov, int iov_len)
int coroipcs_response_iov_send (void *conn, const struct iovec *iov, unsigned int iov_len)
{
struct conn_info *conn_info = (struct conn_info *)conn;
struct sembuf sop;
@ -672,7 +672,7 @@ static int memcpy_dwrap (struct conn_info *conn_info, void *msg, int len)
return (0);
}
static void msg_send (void *conn, const struct iovec *iov, int iov_len,
static void msg_send (void *conn, const struct iovec *iov, unsigned int iov_len,
int locked)
{
struct conn_info *conn_info = (struct conn_info *)conn;
@ -794,7 +794,7 @@ retry_recv:
return (0);
}
static void msg_send_or_queue (void *conn, const struct iovec *iov, int iov_len)
static void msg_send_or_queue (void *conn, const struct iovec *iov, unsigned int iov_len)
{
struct conn_info *conn_info = (struct conn_info *)conn;
unsigned int bytes_left;
@ -876,7 +876,7 @@ int coroipcs_dispatch_send (void *conn, const void *msg, int mlen)
return (0);
}
int coroipcs_dispatch_iov_send (void *conn, const struct iovec *iov, int iov_len)
int coroipcs_dispatch_iov_send (void *conn, const struct iovec *iov, unsigned int iov_len)
{
msg_send_or_queue (conn, iov, iov_len);
return (0);

4
exec/coroipcs.h
View File

@ -80,12 +80,12 @@ extern void *coroipcs_private_data_get (void *conn);
extern int coroipcs_response_send (void *conn, const void *msg, int mlen);
extern int coroipcs_response_iov_send (void *conn,
const struct iovec *iov, int iov_len);
const struct iovec *iov, unsigned int iov_len);
extern int coroipcs_dispatch_send (void *conn, const void *msg, int mlen);
extern int coroipcs_dispatch_iov_send (void *conn,
const struct iovec *iov, int iov_len);
const struct iovec *iov, unsigned int iov_len);
extern void coroipcs_refcount_inc (void *conn);

4
exec/main.c
View File

@ -413,7 +413,7 @@ static void corosync_mlockall (void)
static void deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required)
{
mar_req_header_t *header;
@ -474,7 +474,7 @@ void main_get_config_modules(struct config_iface_ver0 ***modules, int *num)
int main_mcast (
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
unsigned int guarantee)
{
return (totempg_groups_mcast_joined (corosync_group_handle, iovec, iov_len, guarantee));

2
exec/main.h
View File

@ -57,7 +57,7 @@ extern void main_get_config_modules(struct config_iface_ver0 ***modules, int *nu
extern int main_mcast (
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
unsigned int guarantee);
extern void message_source_set (mar_message_source_t *source, void *conn);

4
exec/sync.c
View File

@ -107,7 +107,7 @@ static int sync_service_process (enum totem_callback_token_type type,
static void sync_deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required);
static void sync_confchg_fn (
@ -332,7 +332,7 @@ static void sync_endian_convert (struct req_exec_sync_barrier_start
static void sync_deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required)
{
struct req_exec_sync_barrier_start *req_exec_sync_barrier_start =

10
exec/totemmrp.c
View File

@ -69,7 +69,7 @@ hdb_handle_t totemsrp_handle_in;
void totemmrp_deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required);
void totemmrp_confchg_fn (
@ -82,7 +82,7 @@ void totemmrp_confchg_fn (
void (*pg_deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required) = 0;
void (*pg_confchg_fn) (
@ -95,7 +95,7 @@ void (*pg_confchg_fn) (
void totemmrp_deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required)
{
pg_deliver_fn (nodeid, iovec, iov_len, endian_conversion_required);
@ -125,7 +125,7 @@ int totemmrp_initialize (
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
enum totem_configuration_type configuration_type,
@ -158,7 +158,7 @@ void totemmrp_finalize (void)
*/
int totemmrp_mcast (
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int priority)
{
return totemsrp_mcast (totemsrp_handle_in, iovec, iov_len, priority);

4
exec/totemmrp.h
View File

@ -62,7 +62,7 @@ extern int totemmrp_initialize (
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
enum totem_configuration_type configuration_type,
@ -78,7 +78,7 @@ extern void totemmrp_finalize (void);
*/
extern int totemmrp_mcast (
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int priority);
/*

14
exec/totemnet.c
View File

@ -191,7 +191,7 @@ struct totemnet_instance {
struct work_item {
struct iovec iovec[20];
int iov_len;
unsigned int iov_len;
struct totemnet_instance *instance;
};
@ -307,7 +307,7 @@ static void encrypt_and_sign_worker (
unsigned char *buf,
int *buf_len,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
prng_state *prng_state_in)
{
int i;
@ -388,7 +388,7 @@ static inline void ucast_sendmsg (
struct totemnet_instance *instance,
struct totem_ip_address *system_to,
struct iovec *iovec_in,
int iov_len_in)
unsigned int iov_len_in)
{
struct msghdr msg_ucast;
int res = 0;
@ -398,7 +398,7 @@ static inline void ucast_sendmsg (
struct iovec iovec_encrypt[20];
struct iovec *iovec_sendmsg;
struct sockaddr_storage sockaddr;
int iov_len;
unsigned int iov_len;
int addrlen;
if (instance->totem_config->secauth == 1) {
@ -452,7 +452,7 @@ static inline void ucast_sendmsg (
static inline void mcast_sendmsg (
struct totemnet_instance *instance,
struct iovec *iovec_in,
int iov_len_in)
unsigned int iov_len_in)
{
struct msghdr msg_mcast;
int res = 0;
@ -462,7 +462,7 @@ static inline void mcast_sendmsg (
struct iovec iovec_encrypt[20];
struct iovec *iovec_sendmsg;
struct sockaddr_storage sockaddr;
int iov_len;
unsigned int iov_len;
int addrlen;
if (instance->totem_config->secauth == 1) {
@ -1343,7 +1343,7 @@ error_exit:
int totemnet_token_send (
hdb_handle_t handle,
struct iovec *iovec,
int iov_len)
unsigned int iov_len)
{
struct totemnet_instance *instance;
int res = 0;

2
exec/totemnet.h
View File

@ -73,7 +73,7 @@ extern int totemnet_processor_count_set (
extern int totemnet_token_send (
hdb_handle_t handle,
struct iovec *iovec,
int iov_len);
unsigned int iov_len);
extern int totemnet_mcast_flush_send (
hdb_handle_t handle,

12
exec/totempg.c
View File

@ -212,7 +212,7 @@ struct totempg_group_instance {
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required);
void (*confchg_fn) (
@ -503,7 +503,7 @@ static void totempg_confchg_fn (
static void totempg_deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required)
{
struct totempg_mcast *mcast;
@ -754,7 +754,7 @@ void totempg_finalize (void)
*/
static int mcast_msg (
struct iovec *iovec_in,
int iov_len,
unsigned int iov_len,
int guarantee)
{
int res = 0;
@ -991,7 +991,7 @@ int totempg_groups_initialize (
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
@ -1102,7 +1102,7 @@ error_exit:
int totempg_groups_mcast_joined (
hdb_handle_t handle,
const struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int guarantee)
{
struct totempg_group_instance *instance;
@ -1145,7 +1145,7 @@ error_exit:
int totempg_groups_joined_reserve (
hdb_handle_t handle,
const struct iovec *iovec,
int iov_len)
unsigned int iov_len)
{
struct totempg_group_instance *instance;
unsigned int size = 0;

14
exec/totemsrp.c
View File

@ -277,12 +277,12 @@ struct memb_commit_token {
struct message_item {
struct mcast *mcast;
struct iovec iovec[MAXIOVS];
int iov_len;
unsigned int iov_len;
};
struct sort_queue_item {
struct iovec iovec[MAXIOVS];
int iov_len;
unsigned int iov_len;
};
struct orf_token_mcast_thread_state {
@ -451,14 +451,14 @@ struct totemsrp_instance {
/*
* Function called when new message received
*/
int (*totemsrp_recv) (char *group, struct iovec *iovec, int iov_len);
int (*totemsrp_recv) (char *group, struct iovec *iovec, unsigned int iov_len);
struct totem_ip_address mcast_address;
void (*totemsrp_deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required);
void (*totemsrp_confchg_fn) (
@ -694,7 +694,7 @@ int totemsrp_initialize (
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
@ -2036,7 +2036,7 @@ error_exit:
int totemsrp_mcast (
hdb_handle_t handle,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int guarantee)
{
int i;
@ -2576,7 +2576,7 @@ static int token_send (
{
struct iovec iovec;
int res = 0;
int iov_len = sizeof (struct orf_token) +
unsigned int iov_len = sizeof (struct orf_token) +
(orf_token->rtr_list_entries * sizeof (struct rtr_item));
memcpy (instance->orf_token_retransmit, orf_token, iov_len);

4
exec/totemsrp.h
View File

@ -54,7 +54,7 @@ int totemsrp_initialize (
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
enum totem_configuration_type configuration_type,
@ -71,7 +71,7 @@ void totemsrp_finalize (hdb_handle_t handle);
int totemsrp_mcast (
hdb_handle_t handle,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int priority);
/*

2
exec/vsf_ykd.c
View File

@ -342,7 +342,7 @@ static void ykd_state_endian_convert (struct ykd_state *ykd_state)
static void ykd_deliver_fn (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required)
{
int all_received = 1;

4
include/corosync/coroipcc.h
View File

@ -96,7 +96,7 @@ cs_error_t
coroipcc_msg_send_reply_receive (
void *ipc_context,
const struct iovec *iov,
int iov_len,
unsigned int iov_len,
void *res_msg,
int res_len);
@ -104,7 +104,7 @@ cs_error_t
coroipcc_msg_send_reply_receive_in_buf (
void *ipc_context,
const struct iovec *iov,
int iov_len,
unsigned int iov_len,
void **res_msg);
cs_error_t

2
include/corosync/cpg.h
View File

@ -175,7 +175,7 @@ cs_error_t cpg_mcast_joined (
cpg_handle_t handle,
cpg_guarantee_t guarantee,
struct iovec *iovec,
int iov_len);
unsigned int iov_len);
/*
* Get membership information from cpg

16
include/corosync/engine/coroapi.h
View File

@ -394,12 +394,12 @@ struct corosync_api_v1 {
int (*ipc_response_send) (void *conn, const void *msg, int mlen);
int (*ipc_response_iov_send) (void *conn,
const struct iovec *iov, int iov_len);
const struct iovec *iov, unsigned int iov_len);
int (*ipc_dispatch_send) (void *conn, const void *msg, int mlen);
int (*ipc_dispatch_iov_send) (void *conn,
const struct iovec *iov, int iov_len);
const struct iovec *iov, unsigned int iov_len);
void (*ipc_refcnt_inc) (void *conn);
@ -414,7 +414,7 @@ struct corosync_api_v1 {
int (*totem_ring_reenable) (void);
int (*totem_mcast) (struct iovec *iovec, int iov_len, unsigned int guarantee);
int (*totem_mcast) (struct iovec *iovec, unsigned int iov_len, unsigned int guarantee);
int (*totem_ifaces_get) (
unsigned int nodeid,
@ -445,7 +445,7 @@ struct corosync_api_v1 {
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
@ -474,13 +474,13 @@ struct corosync_api_v1 {
int (*tpg_joined_mcast) (
hdb_handle_t handle,
const struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int guarantee);
int (*tpg_joined_reserve) (
hdb_handle_t handle,
const struct iovec *iovec,
int iov_len);
unsigned int iov_len);
int (*tpg_joined_release) (
int reserved_msgs);
@ -491,14 +491,14 @@ struct corosync_api_v1 {
const struct corosync_tpg_group *groups,
int groups_cnt,
const struct iovec *iovec,
int iov_len);
unsigned int iov_len);
int (*tpg_groups_reserve) (
hdb_handle_t handle,
const struct corosync_tpg_group *groups,
int groups_cnt,
const struct iovec *iovec,
int iov_len);
unsigned int iov_len);
int (*tpg_groups_release) (
int reserved_msgs);

6
include/corosync/totem/totempg.h
View File

@ -81,7 +81,7 @@ extern int totempg_groups_initialize (
void (*deliver_fn) (
unsigned int nodeid,
struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int endian_conversion_required),
void (*confchg_fn) (
@ -107,13 +107,13 @@ extern int totempg_groups_leave (
extern int totempg_groups_mcast_joined (
hdb_handle_t handle,
const struct iovec *iovec,
int iov_len,
unsigned int iov_len,
int guarantee);
extern int totempg_groups_joined_reserve (
hdb_handle_t handle,
const struct iovec *iovec,
int iov_len);
unsigned int iov_len);
extern int totempg_groups_joined_release (
int msg_count);

6
lib/coroipcc.c
View File

@ -580,7 +580,7 @@ static cs_error_t
coroipcc_msg_send (
void *ipc_context,
const struct iovec *iov,
int iov_len)
unsigned int iov_len)
{
struct ipc_segment *ipc_segment = (struct ipc_segment *)ipc_context;
struct sembuf sop;
@ -689,7 +689,7 @@ cs_error_t
coroipcc_msg_send_reply_receive (
void *ipc_context,
const struct iovec *iov,
int iov_len,
unsigned int iov_len,
void *res_msg,
int res_len)
{
@ -712,7 +712,7 @@ cs_error_t
coroipcc_msg_send_reply_receive_in_buf (
void *ipc_context,
const struct iovec *iov,
int iov_len,
unsigned int iov_len,
void **res_msg)
{
unsigned int res;

2
lib/cpg.c
View File

@ -493,7 +493,7 @@ cs_error_t cpg_mcast_joined (
cpg_handle_t handle,
cpg_guarantee_t guarantee,
struct iovec *iovec,
int iov_len)
unsigned int iov_len)
{
int i;
cs_error_t error;

4
lib/util.h
View File

@ -93,12 +93,12 @@ saSendRetry (
cs_error_t saSendMsgRetry (
int s,
struct iovec *iov,
int iov_len);
unsigned int iov_len);
cs_error_t saSendMsgReceiveReply (
int s,
struct iovec *iov,
int iov_len,
unsigned int iov_len,
void *responseMessage,
int responseLen);

2
services/pload.c
View File

@ -263,7 +263,7 @@ static int send_message (enum totem_callback_token_type type, const void *arg)
struct req_exec_pload_mcast req_exec_pload_mcast;
struct iovec iov[2];
unsigned int res;
int iov_len = 1;
unsigned int iov_len = 1;
req_exec_pload_mcast.header.id =
SERVICE_ID_MAKE (PLOAD_SERVICE, MESSAGE_REQ_EXEC_PLOAD_MCAST);

4
services/votequorum.c
View File

@ -178,7 +178,7 @@ static void quorum_confchg_fn (
const unsigned int *joined_list, size_t joined_list_entries,
const struct memb_ring_id *ring_id);
static void quorum_deliver_fn(unsigned int nodeid, struct iovec *iovec, int iov_len,
static void quorum_deliver_fn(unsigned int nodeid, struct iovec *iovec, unsigned int iov_len,
int endian_conversion_required);
static int votequorum_exec_init_fn (struct corosync_api_v1 *corosync_api);
@ -976,7 +976,7 @@ static void exec_quorum_killnode_endian_convert (void *msg)
killnode->nodeid = swab32(killnode->nodeid);
}
static void quorum_deliver_fn(unsigned int nodeid, struct iovec *iovec, int iov_len,
static void quorum_deliver_fn(unsigned int nodeid, struct iovec *iovec, unsigned int iov_len,
int endian_conversion_required)
{
struct q_protheader *header = iovec->iov_base;