CVS commit: [prg-localcount2] src/sys/dev/mscp

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Sun May 14 13:02:35 UTC 2017

Modified Files:
        src/sys/dev/mscp [prg-localcount2]: mscp_disk.c

Log Message:
Rearrange the else clauses to make it work.


To generate a diff of this commit:
cvs rdiff -u -r1.89.8.1 -r1.89.8.2 src/sys/dev/mscp/mscp_disk.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.89.8.1 src/sys/dev/mscp/mscp_disk.c:1.89.8.2
--- src/sys/dev/mscp/mscp_disk.c:1.89.8.1	Thu Apr 27 05:36:35 2017
+++ src/sys/dev/mscp/mscp_disk.c	Sun May 14 13:02:35 2017
@@ -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 @@ ra_putonline(dev_t dev, struct ra_softc 
 	    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);
-	}
-#endif /* NRACD */
-	else {
+#else
 		printf(": %s", msg);
+#endif /* NRACD */
 	}
 
 	printf(": size %d sectors\n", dl->d_secperunit);