From mboxrd@z Thu Jan 1 00:00:00 1970 From: pcaulfield@sourceware.org Date: 1 Sep 2006 08:47:41 -0000 Subject: [Cluster-devel] cluster/cman/lib libcman.h Message-ID: <20060901084741.2659.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: pcaulfield at sourceware.org 2006-09-01 08:47:40 Modified files: cman/lib : libcman.h Log message: Rename 'private' to 'privdata' so it doesn't upset C++ Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/libcman.h.diff?cvsroot=cluster&r1=1.27&r2=1.28 --- cluster/cman/lib/libcman.h 2006/08/17 13:22:39 1.27 +++ cluster/cman/lib/libcman.h 2006/09/01 08:47:40 1.28 @@ -174,14 +174,14 @@ */ /* Callback routine for a membership event */ -typedef void (*cman_callback_t)(cman_handle_t handle, void *private, int reason, int arg); +typedef void (*cman_callback_t)(cman_handle_t handle, void *privdata, int reason, int arg); /* Callback routine for data received */ -typedef void (*cman_datacallback_t)(cman_handle_t handle, void *private, +typedef void (*cman_datacallback_t)(cman_handle_t handle, void *privdata, char *buf, int len, uint8_t port, int nodeid); -typedef void (*cman_confchgcallback_t)(cman_handle_t handle, void *private, +typedef void (*cman_confchgcallback_t)(cman_handle_t handle, void *privdata, unsigned int *member_list, int member_list_entries, unsigned int *left_list, int left_list_entries, unsigned int *joined_list, int joined_list_entries); @@ -193,13 +193,13 @@ * * Note that admin sockets can't send data messages or receive callbacks. */ -cman_handle_t cman_init(void *private); -cman_handle_t cman_admin_init(void *private); +cman_handle_t cman_init(void *privdata); +cman_handle_t cman_admin_init(void *privdata); int cman_finish(cman_handle_t handle); /* Update/retrieve the private data */ -int cman_set_private(cman_handle_t *h, void *private); -int cman_get_private(cman_handle_t *h, void **private); +int cman_set_private(cman_handle_t *h, void *privdata); +int cman_get_private(cman_handle_t *h, void **privdata); /* * Notification of membership change events. Note that these are sent after