[Openais] [PATCH 11/15] cpg.h: cpg_deliver_fn_t: msg: const; len: size_t

[Jim Meyering]

From: Jim Meyering <meyer...@redhat.com>

* include/corosync/cpg.h: cpg_deliver_fn_t: msg: const; len: size_t
Propagate to uses.
* test/cpgbench.c (cpg_bm_deliver_fn):
* test/testcpg.c (DeliverCallback):
---
 include/corosync/cpg.h |    6 +++---
 test/cpgbench.c        |    4 ++--
 test/testcpg.c         |    9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/corosync/cpg.h b/include/corosync/cpg.h
index 348ddb1..3b6b837 100644
--- a/include/corosync/cpg.h
+++ b/include/corosync/cpg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Red Hat, Inc.
+ * Copyright (c) 2006-2009 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -84,8 +84,8 @@ typedef void (*cpg_deliver_fn_t) (
        struct cpg_name *group_name,
        uint32_t nodeid,
        uint32_t pid,
-       void *msg,
-       int msg_len);
+       const void *msg,
+       size_t msg_len);

 typedef void (*cpg_confchg_fn_t) (
        cpg_handle_t handle,
diff --git a/test/cpgbench.c b/test/cpgbench.c
index 23f15d7..359b0ba 100644
--- a/test/cpgbench.c
+++ b/test/cpgbench.c
@@ -85,8 +85,8 @@ static void cpg_bm_deliver_fn (
         struct cpg_name *group_name,
         uint32_t nodeid,
         uint32_t pid,
-        void *msg,
-        int msg_len)
+        const void *msg,
+        size_t msg_len)
 {
        write_count++;
 }
diff --git a/test/testcpg.c b/test/testcpg.c
index 2ab68c9..05c05b4 100644
--- a/test/testcpg.c
+++ b/test/testcpg.c
@@ -67,17 +67,18 @@ static void DeliverCallback (
        struct cpg_name *groupName,
        uint32_t nodeid,
        uint32_t pid,
-       void *msg,
-       int msg_len)
+       const void *msg,
+       size_t msg_len)
 {
        if (show_ip) {
                struct in_addr saddr;
                saddr.s_addr = nodeid;
                printf("DeliverCallback: message (len=%d)from node/pid %s/%d: 
'%s'\n",
-                      msg_len, inet_ntoa(saddr), pid, (char *)msg);
+                      (int) msg_len, inet_ntoa(saddr), pid, (const char *)msg);
        }
        else {
-               printf("DeliverCallback: message (len=%d)from node/pid %d/%d: 
'%s'\n", msg_len, nodeid, pid, (char *)msg);
+               printf("DeliverCallback: message (len=%d)from node/pid %d/%d: 
'%s'\n",
+                      (int) msg_len, nodeid, pid, (const char *)msg);
        }
 }

-- 
1.6.2.rc1.285.gc5f54

_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais