From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 15 Aug 2007 18:41:14 -0000
Subject: [Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c
Message-ID: <20070815184114.20012.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-08-15 18:41:12

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/utils: clustat.c 

Log message:
	Fix uninitialized var

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31.2.24&r2=1.31.2.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.25.2.5&r2=1.25.2.6

--- cluster/rgmanager/ChangeLog	2007/08/02 14:46:51	1.31.2.24
+++ cluster/rgmanager/ChangeLog	2007/08/15 18:41:10	1.31.2.25
@@ -1,3 +1,7 @@
+2007-08-15 Lon Hohberger <lhh@redhat.com>
+	* src/utils/clustat.c: Remove uninitialized var & fix logic /
+	spotted by Ryan McCabe
+
 2007-08-02 Lon Hohberger <lhh@redhat.com>
 	* general: More fixes around #248727
 	* include/reslist.h, src/daemons/restree.c: Make last-value be
--- cluster/rgmanager/src/utils/clustat.c	2007/02/06 20:20:23	1.25.2.5
+++ cluster/rgmanager/src/utils/clustat.c	2007/08/15 18:41:12	1.25.2.6
@@ -835,7 +835,7 @@
 int
 main(int argc, char **argv)
 {
-	int fd, qs, ret = 0;
+	int qs, ret = 0;
 	cluster_member_list_t *membership;
 	rg_state_list_t *rgs = NULL;
 	int local_node_id;
@@ -926,25 +926,25 @@
 
 	switch(runtype) {
 	case QSTAT_ONLY:
-		if (fd < 0)
+		if (!ch)
 		       break;
 		ret = !(cman_is_quorate(ch));
 		goto cleanup;
 	case VERSION_ONLY:
 		printf("%s version %s\n", basename(argv[0]),
 		       PACKAGE_VERSION);
-		if (fd < 0)
+		if (!ch)
 		       break;
 		goto cleanup;
 	case NODEID_ONLY:
-		if (fd < 0)
+		if (!ch)
 		       break;
 		local_node_id = get_my_nodeid(ch);
 		printf("0x%08x\n",(uint32_t)(local_node_id)); 
 		goto cleanup;
 	}
 
-	if (fd < 0) {
+	if (!ch) {
 		printf("Could not connect to cluster service\n");
 		return 1;
 	}