From: Jes Sorensen <jsorensen@fb.com>
Date: Thu, 11 May 2017 20:40:16 +0000 (-0400)
Subject: Monitor: Not much point declaring mdlist in both forks of the if() statement
X-Git-Tag: mdadm-4.1-rc1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f3dd4549b2b904d343b79a8a7ba40c547e71d5d;p=thirdparty%2Fmdadm.git

Monitor: Not much point declaring mdlist in both forks of the if() statement

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---

diff --git a/Monitor.c b/Monitor.c
index 5b958478..a4afe751 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -127,6 +127,7 @@ int Monitor(struct mddev_dev *devlist,
 	struct mdstat_ent *mdstat = NULL;
 	char *mailfrom = NULL;
 	struct alert_info info;
+	struct mddev_ident *mdlist;
 
 	if (!mailaddr) {
 		mailaddr = conf_get_mailaddr();
@@ -162,7 +163,7 @@ int Monitor(struct mddev_dev *devlist,
 			return 1;
 
 	if (devlist == NULL) {
-		struct mddev_ident *mdlist = conf_get_ident(NULL);
+		mdlist = conf_get_ident(NULL);
 		for (; mdlist; mdlist=mdlist->next) {
 			struct state *st;
 			if (mdlist->devname == NULL)
@@ -189,8 +190,8 @@ int Monitor(struct mddev_dev *devlist,
 	} else {
 		struct mddev_dev *dv;
 		for (dv=devlist ; dv; dv=dv->next) {
-			struct mddev_ident *mdlist = conf_get_ident(dv->devname);
 			struct state *st = xcalloc(1, sizeof *st);
+			mdlist = conf_get_ident(dv->devname);
 			st->devname = xstrdup(dv->devname);
 			st->next = statelist;
 			st->devnm[0] = 0;