From: Jim Meyering <[email protected]>
* include/corosync/cpg.h (cpg_deliver_fn_t, cpg_confchg_fn_t):
(cpg_groups_get_fn_t):
* test/cpgbench.c (cpg_bm_confchg_fn, cpg_bm_deliver_fn):
* test/testcpg.c (print_cpgname, DeliverCallback):
(ConfchgCallback):
* test/testcpg2.c (deliver, confch):
---
include/corosync/cpg.h | 6 +++---
test/cpgbench.c | 4 ++--
test/testcpg.c | 6 +++---
test/testcpg2.c | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/corosync/cpg.h b/include/corosync/cpg.h
index 3b6b837..7ccb729 100644
--- a/include/corosync/cpg.h
+++ b/include/corosync/cpg.h
@@ -81,7 +81,7 @@ struct cpg_name {
typedef void (*cpg_deliver_fn_t) (
cpg_handle_t handle,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
uint32_t nodeid,
uint32_t pid,
const void *msg,
@@ -89,7 +89,7 @@ typedef void (*cpg_deliver_fn_t) (
typedef void (*cpg_confchg_fn_t) (
cpg_handle_t handle,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
struct cpg_address *member_list, int member_list_entries,
struct cpg_address *left_list, int left_list_entries,
struct cpg_address *joined_list, int joined_list_entries);
@@ -98,7 +98,7 @@ typedef void (*cpg_groups_get_fn_t) (
cpg_handle_t handle,
uint32_t group_num,
uint32_t group_total,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
struct cpg_address *member_list, int member_list_entries);
typedef struct {
diff --git a/test/cpgbench.c b/test/cpgbench.c
index 359b0ba..c5d0b7c 100644
--- a/test/cpgbench.c
+++ b/test/cpgbench.c
@@ -71,7 +71,7 @@ static int alarm_notice;
static void cpg_bm_confchg_fn (
cpg_handle_t handle,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
struct cpg_address *member_list, int member_list_entries,
struct cpg_address *left_list, int left_list_entries,
struct cpg_address *joined_list, int joined_list_entries)
@@ -82,7 +82,7 @@ static unsigned int write_count;
static void cpg_bm_deliver_fn (
cpg_handle_t handle,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
uint32_t nodeid,
uint32_t pid,
const void *msg,
diff --git a/test/testcpg.c b/test/testcpg.c
index 05c05b4..bf90b7e 100644
--- a/test/testcpg.c
+++ b/test/testcpg.c
@@ -53,7 +53,7 @@
static int quit = 0;
static int show_ip = 0;
-static void print_cpgname (struct cpg_name *name)
+static void print_cpgname (const struct cpg_name *name)
{
int i;
@@ -64,7 +64,7 @@ static void print_cpgname (struct cpg_name *name)
static void DeliverCallback (
cpg_handle_t handle,
- struct cpg_name *groupName,
+ const struct cpg_name *groupName,
uint32_t nodeid,
uint32_t pid,
const void *msg,
@@ -84,7 +84,7 @@ static void DeliverCallback (
static void ConfchgCallback (
cpg_handle_t handle,
- struct cpg_name *groupName,
+ const struct cpg_name *groupName,
struct cpg_address *member_list, int member_list_entries,
struct cpg_address *left_list, int left_list_entries,
struct cpg_address *joined_list, int joined_list_entries)
diff --git a/test/testcpg2.c b/test/testcpg2.c
index ee0336f..79b7583 100644
--- a/test/testcpg2.c
+++ b/test/testcpg2.c
@@ -45,18 +45,18 @@
static void deliver(
cpg_handle_t handle,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
uint32_t nodeid,
uint32_t pid,
- void *msg,
- int msg_len)
+ const void *msg,
+ size_t msg_len)
{
printf("self delivered nodeid: %x\n", nodeid);
}
static void confch(
cpg_handle_t handle,
- struct cpg_name *group_name,
+ const struct cpg_name *group_name,
struct cpg_address *member_list, int member_list_entries,
struct cpg_address *left_list, int left_list_entries,
struct cpg_address *joined_list, int joined_list_entries)
--
1.6.2.rc1.285.gc5f54
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
