From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 26 Jan 2007 21:06:01 -0000
Subject: [Cluster-devel] cluster/rgmanager/src daemons/reslist.c utils/ ...
Message-ID: <20070126210601.1002.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: 	STABLE
Changes by:	lhh at sourceware.org	2007-01-26 21:06:01

Modified files:
	rgmanager/src/daemons: reslist.c 
	rgmanager/src/utils: clustat.c 

Log message:
	Merge clustat fix from RHEL4 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/reslist.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.6.2.4.6.4&r2=1.6.2.4.6.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.5.2.3.6.10&r2=1.5.2.3.6.11

--- cluster/rgmanager/src/daemons/reslist.c	2007/01/26 20:47:16	1.6.2.4.6.4
+++ cluster/rgmanager/src/daemons/reslist.c	2007/01/26 21:06:01	1.6.2.4.6.5
@@ -771,7 +771,6 @@
 				      "Error storing %s resource\n",
 				      newres->r_rule->rr_type);
 #endif
-
 			       destroy_resource(newres);
 		       }
 
--- cluster/rgmanager/src/utils/clustat.c	2007/01/22 23:10:01	1.5.2.3.6.10
+++ cluster/rgmanager/src/utils/clustat.c	2007/01/26 21:06:01	1.5.2.3.6.11
@@ -234,9 +234,6 @@
 		}
 
 		if (!m) {
-			printf("%s not found\n", these->cml_members[x].cm_name);
-			/* WTF? It's not in our config */
-			printf("realloc %d\n", (int)cml_size((all->cml_count+1)));
 			all = realloc(all, cml_size((all->cml_count+1)));
 			if (!all) {
 				perror("realloc");