public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Christine Caulfield <chrissie@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - cman: Fix some compile-time warning Date: Tue, 23 Jun 2009 07:43:00 -0000 [thread overview] Message-ID: <20090623074305.5480F12037D@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8a1df5b0bc701fca57996e766ea54c26f48874ea Commit: 8a1df5b0bc701fca57996e766ea54c26f48874ea Parent: 26ec8a8072a5bc9b4f74ed1075460fc9bd27cbd2 Author: Christine Caulfield <ccaulfie@redhat.com> AuthorDate: Tue Jun 23 08:42:25 2009 +0100 Committer: Christine Caulfield <ccaulfie@redhat.com> CommitterDate: Tue Jun 23 08:42:25 2009 +0100 cman: Fix some compile-time warning Actually one of those warnings was a bug that would prevent cross-endian clusters working. Signed-off-by: Christine Caulfield <ccaulfie@redhat.com> --- cman/daemon/ais.c | 2 ++ cman/daemon/commands.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c index 3b0a2db..ffea8c2 100644 --- a/cman/daemon/ais.c +++ b/cman/daemon/ais.c @@ -258,6 +258,8 @@ static void cman_deliver_fn(unsigned int nodeid, const void *msg, unsigned int m header.srcid = swab32(original_header->srcid); header.tgtid = swab32(original_header->tgtid); header.flags = swab32(original_header->flags); + header.srcport = original_header->srcport; + header.tgtport = original_header->tgtport; } else { memcpy(&header, original_header, sizeof(header)); diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index b343bcb..2eb8101 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -581,7 +581,7 @@ static int do_cmd_get_extrainfo(char *cmdbuf, char **retbuf, int retsize, int *r objdb_get_string(corosync, object_handle, "mcastaddr", &mcast); /* If this fails, it must be using broadcast*/ if (!mcast) - mcast = "255.255.255.255"; + mcast = (char*)"255.255.255.255"; memset(ptr, 0, sizeof(struct sockaddr_storage)); saddr4 = (struct sockaddr_in *)ptr;
reply other threads:[~2009-06-23 7:43 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090623074305.5480F12037D@lists.fedorahosted.org \ --to=chrissie@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).