From: Jim Meyering <[email protected]>
* exec/quorum.h (sync_callback_fn_t):
* exec/sync.c (current_members_cnt, sync_primary_callback_fn):
* exec/sync.h (name):
* exec/vsf_quorum.c (sync_primary_callback_fn):
(quorum_api_set_quorum):
* exec/vsf_ykd.c (ykd_primary_callback_fn):
* include/corosync/engine/coroapi.h (sync_callback_fn_t):
* include/corosync/engine/quorum.h (quorum_set_quorate_fn_t):
---
exec/quorum.h | 6 +++---
exec/sync.c | 6 +++---
exec/sync.h | 8 ++++----
exec/vsf_quorum.c | 6 +++---
exec/vsf_ykd.c | 2 +-
include/corosync/engine/coroapi.h | 4 ++--
include/corosync/engine/quorum.h | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/exec/quorum.h b/exec/quorum.h
index a59df04..5e61dbd 100644
--- a/exec/quorum.h
+++ b/exec/quorum.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
*
* All rights reserved.
*
@@ -40,8 +40,8 @@ struct memb_ring_id;
typedef void (*quorum_callback_fn_t) (int quorate, void *context);
typedef void (*sync_callback_fn_t) (
- 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);
diff --git a/exec/sync.c b/exec/sync.c
index 8a9dd9a..bbcca52 100644
--- a/exec/sync.c
+++ b/exec/sync.c
@@ -124,7 +124,7 @@ static struct totempg_group sync_group = {
static hdb_handle_t sync_group_handle;
static char *service_name;
static unsigned int current_members[PROCESSOR_COUNT_MAX];
-static unsigned int current_members_cnt;
+static size_t current_members_cnt;
struct req_exec_sync_barrier_start {
mar_req_header_t header;
@@ -290,8 +290,8 @@ int sync_register (
}
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)
{
diff --git a/exec/sync.h b/exec/sync.h
index b821990..4ef60a4 100644
--- a/exec/sync.h
+++ b/exec/sync.h
@@ -6,7 +6,7 @@
* Author: Steven Dake ([email protected])
*
* 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:
*
@@ -59,14 +59,14 @@ int sync_primary_designated (void);
/**
* Execute synchronization upon request for the named service
* @param name service handler name to synchronize
- *
+ *
* @return int 0 OK, error code otherwise
*/
extern int sync_request (char *name);
extern 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);
diff --git a/exec/vsf_quorum.c b/exec/vsf_quorum.c
index 14e7e1e..a283f88 100644
--- a/exec/vsf_quorum.c
+++ b/exec/vsf_quorum.c
@@ -100,13 +100,13 @@ static int quorum_view_list[PROCESSOR_COUNT_MAX];
struct quorum_services_api_ver1 *quorum_iface = NULL;
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);
/* Internal quorum API function */
-static void quorum_api_set_quorum(unsigned int *view_list,
+static void quorum_api_set_quorum(const unsigned int *view_list,
size_t view_list_entries,
int quorum, struct memb_ring_id *ring_id)
{
diff --git a/exec/vsf_ykd.c b/exec/vsf_ykd.c
index 521fedd..f4b3ebc 100644
--- a/exec/vsf_ykd.c
+++ b/exec/vsf_ykd.c
@@ -145,7 +145,7 @@ static void *ykd_state_send_callback_token_handle = 0;
static struct corosync_api_v1 *api;
static void (*ykd_primary_callback_fn) (
- unsigned int *view_list,
+ const unsigned int *view_list,
size_t view_list_entries,
int primary_designated,
struct memb_ring_id *ring_id) = NULL;
diff --git a/include/corosync/engine/coroapi.h
b/include/corosync/engine/coroapi.h
index 723d81f..224185b 100644
--- a/include/corosync/engine/coroapi.h
+++ b/include/corosync/engine/coroapi.h
@@ -209,8 +209,8 @@ struct quorum_callin_functions
};
typedef void (*sync_callback_fn_t) (
- 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);
diff --git a/include/corosync/engine/quorum.h b/include/corosync/engine/quorum.h
index cca3e23..4bd28d6 100644
--- a/include/corosync/engine/quorum.h
+++ b/include/corosync/engine/quorum.h
@@ -35,7 +35,7 @@
#ifndef QUORUM_H_DEFINED
#define QUORUM_H_DEFINED
-typedef void (*quorum_set_quorate_fn_t) (unsigned int *view_list,
+typedef void (*quorum_set_quorate_fn_t) (const unsigned int *view_list,
size_t view_list_entries,
int quorate, struct memb_ring_id *);
--
1.6.2.rc1.285.gc5f54
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
