Date: Sat, 19 May 2018 04:02:30 +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: r333837 - head/sys/kern Message-ID: <201805190402.w4J42UTW021583@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805190402.w4J42UTW021583>