Module Name: src
Committed By: snj
Date: Mon May 7 03:51:01 UTC 2018
Modified Files:
src/usr.sbin/sysinst [netbsd-8]: partman.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.15.6.1 -r1.15.6.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.15.6.1 src/usr.sbin/sysinst/partman.c:1.15.6.2
--- src/usr.sbin/sysinst/partman.c:1.15.6.1 Mon May 7 03:49:16 2018
+++ src/usr.sbin/sysinst/partman.c Mon May 7 03:51:01 2018
@@ -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 @@ pm_cgd_check(void *arg)
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;
}
