From owner-svn-src-all@freebsd.org Sat May 19 04:13:21 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAE4BEEC0C2; Sat, 19 May 2018 04:13:21 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 70BE27B32D; Sat, 19 May 2018 04:13:21 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 522B521FAB; Sat, 19 May 2018 04:13:21 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4J4DLNp027045; Sat, 19 May 2018 04:13:21 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4J4DLag027044; Sat, 19 May 2018 04:13:21 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805190413.w4J4DLag027044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sat, 19 May 2018 04:13:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333844 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 333844 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 04:13:21 -0000 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,