From mboxrd@z Thu Jan 1 00:00:00 1970 From: ccaulfield@sourceware.org Date: 19 Mar 2008 10:38:39 -0000 Subject: [Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-78-gb8920a3 Message-ID: <20080319103839.27329.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 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=b8920a3ce7c3af2f6d8ff8eed4a739f4b7cb81b6 The branch, master has been updated via b8920a3ce7c3af2f6d8ff8eed4a739f4b7cb81b6 (commit) from d7387dedf8cf77f3a4156eb5a5264cca15e4e5bd (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 b8920a3ce7c3af2f6d8ff8eed4a739f4b7cb81b6 Author: Christine Caulfield Date: Wed Mar 19 10:36:54 2008 +0000 [CMAN] Don't declare a variable in the middle of a block Later gccs seem to allow this behaviour (and leaving it like that was a mistake on my part) but I've moved the declaration of 'qm' back to the start of the block for normality's sake. Signed-off-by: Christine Caulfield ----------------------------------------------------------------------- Summary of changes: cman/daemon/daemon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cman/daemon/daemon.c b/cman/daemon/daemon.c index e3160b7..f504db3 100644 --- a/cman/daemon/daemon.c +++ b/cman/daemon/daemon.c @@ -85,6 +85,7 @@ static int send_reply_message(struct connection *con, struct sock_header *msg) if ((ret > 0 && ret != msg->length) || (ret == -1 && errno == EAGAIN)) { + struct queued_reply *qm; /* Have we exceeded the allowed number of queued messages ? */ if (con->num_write_msgs > max_outstanding_messages) { @@ -94,7 +95,7 @@ static int send_reply_message(struct connection *con, struct sock_header *msg) } /* Queue it */ - struct queued_reply *qm = malloc(sizeof(struct queued_reply) + msg->length); + qm = malloc(sizeof(struct queued_reply) + msg->length); if (!qm) { perror("Error allocating queued message"); hooks/post-receive -- Cluster Project