[src/netbsd-8]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/d84b03de7625
branches:  netbsd-8
changeset: 434974:d84b03de7625
user:      snj <snj%NetBSD.org@localhost>
date:      Mon May 07 03:51:01 2018 +0000

description:
Pull up following revision(s) (requested by martin in ticket #794):
        usr.sbin/sysinst/partman.c: 1.18
fixes for GCC 6.4:
sysinst's pm_cgd_check() has missing {} issue.

diffstat:

 usr.sbin/sysinst/partman.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 8cf6fae33c0f -r d84b03de7625 usr.sbin/sysinst/partman.c
--- a/usr.sbin/sysinst/partman.c        Mon May 07 03:49:16 2018 +0000
+++ b/usr.sbin/sysinst/partman.c        Mon May 07 03:51:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partman.c,v 1.15.6.1 2018/05/07 03:49:16 snj Exp $ */
+/*     $NetBSD: partman.c,v 1.15.6.2 2018/05/07 03:51:01 snj Exp $ */
 
 /*
  * Copyright 2012 Eugene Lozovoy
@@ -1099,10 +1099,11 @@
                return 0;
        if (dev_ptr->pm == NULL)
                dev_ptr->enabled = 0;
-       else
+       else {
                pm_manage_getfreenode(&(dev_ptr->node), "cgd", &cgds_t_info);
                if (dev_ptr->node < 0)
                        dev_ptr->enabled = 0;
+       }
        return dev_ptr->enabled;
 }