Date: Sat, 19 May 2018 04:13:21 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333844 - head/sys/kern Message-ID: <201805190413.w4J4DLag027044@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Sat May 19 04:13:20 2018 New Revision: 333844 URL: https://svnweb.freebsd.org/changeset/base/333844 Log: make_dev: avoid unused assignments on non debug builds Modified: head/sys/kern/kern_conf.c Modified: head/sys/kern/kern_conf.c ============================================================================== --- head/sys/kern/kern_conf.c Sat May 19 04:10:53 2018 (r333843) +++ head/sys/kern/kern_conf.c Sat May 19 04:13:20 2018 (r333844) @@ -866,11 +866,13 @@ make_dev(struct cdevsw *devsw, int unit, uid_t uid, gi { struct cdev *dev; va_list ap; +#ifdef INVARIANTS int res; +#endif va_start(ap, fmt); - res = make_dev_credv(0, &dev, devsw, unit, NULL, uid, gid, mode, fmt, - ap); + DBGSET(res, make_dev_credv(0, &dev, devsw, unit, NULL, uid, gid, mode, fmt, + ap)); va_end(ap); KASSERT(res == 0 && dev != NULL, ("make_dev: failed make_dev_credv (error=%d)", res)); @@ -883,10 +885,12 @@ make_dev_cred(struct cdevsw *devsw, int unit, struct u { struct cdev *dev; va_list ap; +#ifdef INVARIANTS int res; +#endif va_start(ap, fmt); - res = make_dev_credv(0, &dev, devsw, unit, cr, uid, gid, mode, fmt, ap); + DBGSET(res, make_dev_credv(0, &dev, devsw, unit, cr, uid, gid, mode, fmt, ap)); va_end(ap); KASSERT(res == 0 && dev != NULL, @@ -996,10 +1000,11 @@ make_dev_alias(struct cdev *pdev, const char *fmt, ... { struct cdev *dev; va_list ap; +#ifdef INVARIANTS int res; - +#endif va_start(ap, fmt); - res = make_dev_alias_v(MAKEDEV_WAITOK, &dev, pdev, fmt, ap); + DBGSET(res, make_dev_alias_v(MAKEDEV_WAITOK, &dev, pdev, fmt, ap)); va_end(ap); KASSERT(res == 0 && dev != NULL,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805190413.w4J4DLag027044>