From 3ef78c9c966c15fedf4182d60c949de7c1820f32 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Sat, 19 May 2018 04:02:29 +0000 Subject: [PATCH] tty: conditionally assign to ret value only used by MPASS statement --- sys/kern/tty_inq.c | 4 +++- sys/kern/tty_outq.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c index 8ebec1422962..fb94910bac60 100644 --- a/sys/kern/tty_inq.c +++ b/sys/kern/tty_inq.c @@ -328,13 +328,15 @@ ttyinq_write(struct ttyinq *ti, const void *buf, size_t nbytes, int quote) 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); diff --git a/sys/kern/tty_outq.c b/sys/kern/tty_outq.c index 0fd5810d0d38..6bfa8d227ef1 100644 --- a/sys/kern/tty_outq.c +++ b/sys/kern/tty_outq.c @@ -324,13 +324,15 @@ ttyoutq_write(struct ttyoutq *to, const void *buf, size_t nbytes) 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);