[src/prg-localcount2]: src/sys/dev/mscp Rearrange the else clauses to make it...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a10b045ee614
branches:  prg-localcount2
changeset: 823543:a10b045ee614
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun May 14 13:02:35 2017 +0000

description:
Rearrange the else clauses to make it work.

diffstat:

 sys/dev/mscp/mscp_disk.c |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (45 lines):

diff -r 3247e9928361 -r a10b045ee614 sys/dev/mscp/mscp_disk.c
--- a/sys/dev/mscp/mscp_disk.c  Sun May 14 05:38:38 2017 +0000
+++ b/sys/dev/mscp/mscp_disk.c  Sun May 14 13:02:35 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mscp_disk.c,v 1.89.8.1 2017/04/27 05:36:35 pgoyette Exp $      */
+/*     $NetBSD: mscp_disk.c,v 1.89.8.2 2017/05/14 13:02:35 pgoyette Exp $      */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.89.8.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.89.8.2 2017/05/14 13:02:35 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -1145,21 +1145,20 @@
            rastrategy, dl, NULL)) == NULL) {
                ra->ra_havelabel = 1;
                ra->ra_state = DK_OPEN;
-       }
+       } else {
 #if NRACD
-       else {
                cdev = cdevsw_lookup_acquire(dev);
                if (cdev == &racd_cdevsw) {
                        dl->d_partitions[0].p_offset = 0;
                        dl->d_partitions[0].p_size = dl->d_secperunit;
                        dl->d_partitions[0].p_fstype = FS_ISO9660;
-               }
+               } else
+                       printf(": %s", msg);
                if (cdev != NULL)
                        cdevsw_release(cdev);
-       }
+#else
+               printf(": %s", msg);
 #endif /* NRACD */
-       else {
-               printf(": %s", msg);
        }
 
        printf(": size %d sectors\n", dl->d_secperunit);