Jim Meyering wrote:
> Jim Meyering wrote:
>> There were some new warnings due to const mismatches
>> and one unused static declaration.
...
> Here's a better way to fix the pointer mismatch problem,
> since we do want that msg parameter to remain "non const".

I've just pushed this, too:

From 37c392aef475304edfea26316aef09cd3707a9cf Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Mon, 4 May 2009 10:35:59 +0200
Subject: [PATCH] votequorum.c: avoid a new warning and add a comment in cpg.h
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

* votequorum.c: Avoid declaration of unused: ‘votequorum_instance_destructor’
* include/corosync/cpg.h (cpg_deliver_fn_t) [msg]: Add a comment explaining
why this member is not const.
---
 include/corosync/cpg.h |    4 ++++
 lib/votequorum.c       |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/corosync/cpg.h b/include/corosync/cpg.h
index 644d8d8..242cbbe 100644
--- a/include/corosync/cpg.h
+++ b/include/corosync/cpg.h
@@ -88,6 +88,10 @@ typedef void (*cpg_deliver_fn_t) (
        const struct cpg_name *group_name,
        uint32_t nodeid,
        uint32_t pid,
+       /*
+        * Unlike many "msg" pointers, this one is deliberately *not*
+        * declared const in order to permit in-place endian conversion.
+        */
        void *msg,
        size_t msg_len);

diff --git a/lib/votequorum.c b/lib/votequorum.c
index fd5a924..f76395a 100644
--- a/lib/votequorum.c
+++ b/lib/votequorum.c
@@ -64,8 +64,6 @@ struct votequorum_inst {
        votequorum_callbacks_t callbacks;
 };

-static void votequorum_instance_destructor (void *instance);
-
 DECLARE_HDB_DATABASE(votequorum_handle_t_db,NULL);

 cs_error_t votequorum_initialize (
--
1.6.3.rc4.190.g4648
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to