Cluster Project branch, master, updated. cluster-2.99.04-17-g4770c30

Cluster Project branch, master, updated. cluster-2.99.04-17-g4770c30

[ccaulfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4770c30eb41d85c6991e1d40b5cd2b906a8e271e

The branch, master has been updated
       via  4770c30eb41d85c6991e1d40b5cd2b906a8e271e (commit)
      from  f6e278da051d685d7bd791abe93d9911db50adea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4770c30eb41d85c6991e1d40b5cd2b906a8e271e
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Thu Jun 12 15:42:05 2008 +0100

    [CMAN] Fix some compiler warnings on 64 bit systems
    
    Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/daemon/ais.c      |    4 ++--
 cman/daemon/commands.c |    3 ++-
 cman/daemon/daemon.c   |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c
index d7246ab..d4c637a 100644
--- a/cman/daemon/ais.c
+++ b/cman/daemon/ais.c
@@ -243,8 +243,8 @@ static void cman_deliver_fn(unsigned int nodeid, struct iovec *iovec, int iov_le
 	struct cl_protheader *header = iovec->iov_base;
 	char *buf = iovec->iov_base;
 
-	P_AIS("deliver_fn called, iov_len = %d, iov[0].len = %d, source nodeid = %d, conversion reqd=%d\n",
-	      iov_len, iovec->iov_len, nodeid, endian_conversion_required);
+	P_AIS("deliver_fn called, iov_len = %d, iov[0].len = %lu, source nodeid = %d, conversion reqd=%d\n",
+	      iov_len, (unsigned long)iovec->iov_len, nodeid, endian_conversion_required);
 
 	if (endian_conversion_required) {
 		header->srcid = swab32(header->srcid);
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 776c88e..755e671 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include <syslog.h>
 #include <string.h>
 #include <sys/time.h>
@@ -2013,7 +2014,7 @@ void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
 {
 	struct cluster_node *node;
 
-	P_MEMB("add_ais_node ID=%d, incarnation = %lld\n",nodeid, incarnation);
+	P_MEMB("add_ais_node ID=%d, incarnation = %" PRIu64 "\n",nodeid, incarnation);
 
 	node = find_node_by_nodeid(nodeid);
 	if (!node && total_members == 1) {
diff --git a/cman/daemon/daemon.c b/cman/daemon/daemon.c
index 0a94411..18c820d 100644
--- a/cman/daemon/daemon.c
+++ b/cman/daemon/daemon.c
@@ -256,8 +256,8 @@ static int process_client(poll_handle handle, int fd, int revent, void *data)
 			uint8_t port;
 			struct sock_data_header *dmsg = (struct sock_data_header *)msg;
 
-			P_DAEMON("sending %d bytes of data to node %d, port %d\n",
-				 msg->length - sizeof(struct sock_data_header), dmsg->nodeid, dmsg->port);
+			P_DAEMON("sending %lu bytes of data to node %d, port %d\n",
+				 (unsigned long)(msg->length - sizeof(struct sock_data_header)), dmsg->nodeid, dmsg->port);
 
 			buf += sizeof(struct sock_data_header);
 


hooks/post-receive
--
Cluster Project