D45017.id137855.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45017.id137855.diff
View Options

	diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
	--- a/usr.sbin/ctladm/ctladm.c
	+++ b/usr.sbin/ctladm/ctladm.c
	@@ -2812,8 +2812,7 @@
	islist = (struct cctl_islist_data *)user_data;
	cur_conn = islist->cur_conn;
	islist->level++;
	- if ((u_int)islist->level >= (sizeof(islist->cur_sb) /
	- sizeof(islist->cur_sb[0])))
	+ if ((u_int)islist->level >= nitems(islist->cur_sb))
	errx(1, "%s: too many nesting levels, %zd max", __func__,
	nitems(islist->cur_sb));

	@@ -3243,8 +3242,7 @@
	devlist = (struct cctl_devlist_data *)user_data;
	cur_lun = devlist->cur_lun;
	devlist->level++;
	- if ((u_int)devlist->level >= (sizeof(devlist->cur_sb) /
	- sizeof(devlist->cur_sb[0])))
	+ if ((u_int)devlist->level >= nitems(devlist->cur_sb))
	errx(1, "%s: too many nesting levels, %zd max", __func__,
	nitems(devlist->cur_sb));

	@@ -3507,8 +3505,7 @@
	portlist = (struct cctl_portlist_data *)user_data;
	cur_port = portlist->cur_port;
	portlist->level++;
	- if ((u_int)portlist->level >= (sizeof(portlist->cur_sb) /
	- sizeof(portlist->cur_sb[0])))
	+ if ((u_int)portlist->level >= nitems(portlist->cur_sb))
	errx(1, "%s: too many nesting levels, %zd max", __func__,
	nitems(portlist->cur_sb));