Module Name: src
Committed By: martin
Date: Tue Aug 5 08:39:39 UTC 2014
Modified Files:
src/usr.sbin/sysinst: partman.c
Log Message:
Avoid comparision between array and NULL
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/partman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.1 src/usr.sbin/sysinst/partman.c:1.2
--- src/usr.sbin/sysinst/partman.c:1.1 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/partman.c Tue Aug 5 08:39:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.1 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: partman.c,v 1.2 2014/08/05 08:39:39 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -2115,8 +2115,7 @@ pm_mountall(void)
pm_i->bsdlabel[i].mnt_opts != NULL))
continue;
mnts[num_devs].mnt_opts = pm_i->bsdlabel[i].mnt_opts;
- if (pm_i->bsdlabel[i].mounted != NULL &&
- strlen(pm_i->bsdlabel[i].mounted) > 0) {
+ if (strlen(pm_i->bsdlabel[i].mounted) > 0) {
/* Device is already mounted. So, doing mount_null */
strlcpy(mnts[num_devs].dev, pm_i->bsdlabel[i].mounted, MOUNTLEN);
mnts[num_devs].mnt_opts = "-t null";
