From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14745 invoked by alias); 29 Jan 2009 13:52:52 -0000 Received: (qmail 14739 invoked by alias); 29 Jan 2009 13:52:52 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: master - cman: Don't return "error: Success" - it's just embarrassing. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4ec60b52bca8f5d44ad35b8ad3754fc6e2463d3c X-Git-Newrev: a1620c2b08020ec676f4e0ab451f627393124142 From: Christine Caulfield Message-Id: <20090129135226.B5665120569@lists.fedorahosted.org> Date: Thu, 29 Jan 2009 13:52:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00314.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a1620c2b08020ec676f4e0ab451f627393124142 Commit: a1620c2b08020ec676f4e0ab451f627393124142 Parent: 4ec60b52bca8f5d44ad35b8ad3754fc6e2463d3c Author: Christine Caulfield AuthorDate: Thu Jan 29 13:51:53 2009 +0000 Committer: Christine Caulfield CommitterDate: Thu Jan 29 13:51:53 2009 +0000 cman: Don't return "error: Success" - it's just embarrassing. Signed-off-by: Christine Caulfield --- cman/services/cman/lib/libcman.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cman/services/cman/lib/libcman.c b/cman/services/cman/lib/libcman.c index 22c51f8..7c575a3 100644 --- a/cman/services/cman/lib/libcman.c +++ b/cman/services/cman/lib/libcman.c @@ -143,7 +143,7 @@ static int refresh_node_list(struct cman_inst *cman_inst) votequorum_trackstart(cman_inst->cmq_handle, 0, CS_TRACK_CURRENT); error = votequorum_dispatch(cman_inst->cmq_handle, CS_DISPATCH_ONE); - return error; + return (error==CS_OK?0:-1); } cman_handle_t cman_init ( @@ -272,7 +272,7 @@ int cman_start_recv_data ( errno = error = res.error; error_exit: - return (error?-1:0); + return (error==CS_OK?0:-1); } int cman_end_recv_data ( @@ -333,7 +333,7 @@ int cman_get_node_addrs ( error = corosync_cfg_get_node_addrs(cman_inst->cfg_handle, nodeid, max_addrs, num_addrs, (corosync_cfg_node_address_t *)addrs); - return (error?-1:0); + return (error==CS_OK?0:-1); } int cman_send_data(cman_handle_t handle, const void *message, int len, int flags, uint8_t port, int nodeid) @@ -529,7 +529,7 @@ int cman_kill_node(cman_handle_t handle, int nodeid) error = corosync_cfg_kill_node(cman_inst->cfg_handle, nodeid, "Killed by cman_tool"); - return error; + return (error==CS_OK?0:-1); } int cman_set_votes(cman_handle_t handle, int votes, int nodeid) @@ -545,7 +545,7 @@ int cman_set_votes(cman_handle_t handle, int votes, int nodeid) error = votequorum_setvotes(cman_inst->cmq_handle, nodeid, votes); - return error; + return (error==CS_OK?0:-1); } int cman_set_expected_votes(cman_handle_t handle, int expected) @@ -561,7 +561,7 @@ int cman_set_expected_votes(cman_handle_t handle, int expected) error = votequorum_setexpected(cman_inst->cmq_handle, expected); - return error; + return (error==CS_OK?0:-1); } int cman_get_fd (