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=b9bb6fd6de f26cfb2dfd860a7969144cf3815555

The branch, STABLE2 has been updated
via b9bb6fd6def26cfb2dfd860a7969144cf3815555 (commit)
from 292e214c55cd3016e184f7d831255b0ffea1af75 (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 b9bb6fd6def26cfb2dfd860a7969144cf3815555
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 9598026..087448d 100644
--- a/cman/daemon/ais.c
+++ b/cman/daemon/ais.c
@@ -382,8 +382,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
",
- 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
",
+ 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 f97c7be..5008d06 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>
@@ -1933,7 +1934,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
",nodeid, incarnation);
+ P_MEMB("add_ais_node ID=%d, incarnation = %" PRIu64 "
",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 edf3ae1..155b126 100644
--- a/cman/daemon/daemon.c
+++ b/cman/daemon/daemon.c
@@ -255,8 +255,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
",
- msg->length - sizeof(struct sock_data_header), dmsg->nodeid, dmsg->port);
+ P_DAEMON("sending %lu bytes of data to node %d, port %d
",
+ (unsigned long)(msg->length - sizeof(struct sock_data_header)), dmsg->nodeid, dmsg->port);

buf += sizeof(struct sock_data_header);



hooks/post-receive
--
Cluster Project