cluster: STABLE32 - rgmanager: Remove unused assignment

Fabio M. Di Nitto fabbione at fedoraproject.org
Wed Aug 15 13:07:13 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=06bed152ffb35a167ad77e31a3ee507439906bf7
Commit:        06bed152ffb35a167ad77e31a3ee507439906bf7
Parent:        5c4dbed756583c48c6c53d264bf1143b80cb372d
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Fri Sep 16 13:28:47 2011 -0400
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Wed Aug 15 11:04:38 2012 +0200

rgmanager: Remove unused assignment

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/clulib/daemon_init.c |    6 +++---
 rgmanager/src/daemons/fo_domain.c  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rgmanager/src/clulib/daemon_init.c b/rgmanager/src/clulib/daemon_init.c
index 7d68ffd..711e06d 100644
--- a/rgmanager/src/clulib/daemon_init.c
+++ b/rgmanager/src/clulib/daemon_init.c
@@ -84,11 +84,11 @@ check_pid_valid(pid_t pid, char *prog)
 	/*
 	 * Check to see if this is the same executable.
 	 */
-	if ((s = strstr(proc_cmdline, prog)) == NULL) {
+	if (strstr(proc_cmdline, prog) == NULL) {
 		return 0;
-	} else {
-		return 1;
 	}
+
+	return 1;
 }
 
 
diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c
index 884f3ae..168d49b 100644
--- a/rgmanager/src/daemons/fo_domain.c
+++ b/rgmanager/src/daemons/fo_domain.c
@@ -439,7 +439,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
 		  const char *rg_name, fod_t **domains)
 {
 	char *nodename = NULL;
-	char domainname[128];
+	char domainname[128] = "";
 	int ordered = 0;
 	int restricted = 0;
 	int nofailback = 0;


More information about the cluster-commits mailing list