Date: Sat, 19 May 2018 05:07:03 +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: r333857 - head/sys/kern Message-ID: <201805190507.w4J573uH053382@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Sat May 19 05:07:03 2018 New Revision: 333857 URL: https://svnweb.freebsd.org/changeset/base/333857 Log: conf: revert last change and annotate unused var instead Modified: head/sys/kern/kern_conf.c Modified: head/sys/kern/kern_conf.c ============================================================================== --- head/sys/kern/kern_conf.c Sat May 19 05:06:18 2018 (r333856) +++ head/sys/kern/kern_conf.c Sat May 19 05:07:03 2018 (r333857) @@ -866,13 +866,11 @@ make_dev(struct cdevsw *devsw, int unit, uid_t uid, gi { struct cdev *dev; va_list ap; -#ifdef INVARIANTS - int res; -#endif + int res __unused; va_start(ap, fmt); - DBGSET(res, make_dev_credv(0, &dev, devsw, unit, NULL, uid, gid, mode, fmt, - ap)); + 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)); @@ -885,12 +883,10 @@ make_dev_cred(struct cdevsw *devsw, int unit, struct u { struct cdev *dev; va_list ap; -#ifdef INVARIANTS - int res; -#endif + int res __unused; va_start(ap, fmt); - DBGSET(res, make_dev_credv(0, &dev, devsw, unit, cr, uid, gid, mode, fmt, ap)); + res = make_dev_credv(0, &dev, devsw, unit, cr, uid, gid, mode, fmt, ap); va_end(ap); KASSERT(res == 0 && dev != NULL, @@ -1000,11 +996,10 @@ make_dev_alias(struct cdev *pdev, const char *fmt, ... { struct cdev *dev; va_list ap; -#ifdef INVARIANTS - int res; -#endif + int res __unused; + va_start(ap, fmt); - DBGSET(res, make_dev_alias_v(MAKEDEV_WAITOK, &dev, pdev, fmt, ap)); + 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?201805190507.w4J573uH053382>