From owner-svn-src-all@freebsd.org Sat May 19 04:02:30 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 CA577EEB735; Sat, 19 May 2018 04:02:30 +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 7E9DA7A5A3; Sat, 19 May 2018 04:02:30 +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 60F7421DFA; Sat, 19 May 2018 04:02:30 +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 w4J42UOq021585; Sat, 19 May 2018 04:02:30 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4J42UTW021583; Sat, 19 May 2018 04:02:30 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805190402.w4J42UTW021583@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:02:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333837 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 333837 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:02:31 -0000 Author: mmacy Date: Sat May 19 04:02:29 2018 New Revision: 333837 URL: https://svnweb.freebsd.org/changeset/base/333837 Log: tty: conditionally assign to ret value only used by MPASS statement Modified: head/sys/kern/tty_inq.c head/sys/kern/tty_outq.c Modified: head/sys/kern/tty_inq.c ============================================================================== --- head/sys/kern/tty_inq.c Sat May 19 04:01:15 2018 (r333836) +++ head/sys/kern/tty_inq.c Sat May 19 04:02:29 2018 (r333837) @@ -328,13 +328,15 @@ ttyinq_write(struct ttyinq *ti, const void *buf, size_ int ttyinq_write_nofrag(struct ttyinq *ti, const void *buf, size_t nbytes, int quote) { +#ifdef INVARIANTS size_t ret; +#endif if (ttyinq_bytesleft(ti) < nbytes) return (-1); /* We should always be able to write it back. */ - ret = ttyinq_write(ti, buf, nbytes, quote); + DBGSET(ret, ttyinq_write(ti, buf, nbytes, quote)); MPASS(ret == nbytes); return (0); Modified: head/sys/kern/tty_outq.c ============================================================================== --- head/sys/kern/tty_outq.c Sat May 19 04:01:15 2018 (r333836) +++ head/sys/kern/tty_outq.c Sat May 19 04:02:29 2018 (r333837) @@ -324,13 +324,15 @@ ttyoutq_write(struct ttyoutq *to, const void *buf, siz int ttyoutq_write_nofrag(struct ttyoutq *to, const void *buf, size_t nbytes) { +#ifdef INVARIANTS size_t ret; +#endif if (ttyoutq_bytesleft(to) < nbytes) return (-1); /* We should always be able to write it back. */ - ret = ttyoutq_write(to, buf, nbytes); + DBGSET(ret, ttyoutq_write(to, buf, nbytes)); MPASS(ret == nbytes); return (0);