]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Monitor: Not much point declaring mdlist in both forks of the if() statement
authorJes Sorensen <jsorensen@fb.com>
Thu, 11 May 2017 20:40:16 +0000 (16:40 -0400)
committerJes Sorensen <jsorensen@fb.com>
Thu, 11 May 2017 20:40:16 +0000 (16:40 -0400)
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Monitor.c

index 5b9584788f5734ae33909640e8b1fc7f922bd08f..a4afe7512d0de4b6fc13bb1b1b44fde6e4ceb076 100644 (file)
--- 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;