From a2bb4e080e0946b076122f868f3d33b4dcb42969 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Sat, 19 May 2018 04:48:26 +0000 Subject: [PATCH] tty: use __unused annotation instead to silence warnings --- sys/kern/tty_inq.c | 6 ++---- sys/kern/tty_outq.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c index fb94910bac60..bd26211735d2 100644 --- a/sys/kern/tty_inq.c +++ b/sys/kern/tty_inq.c @@ -328,15 +328,13 @@ 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 + size_t ret __unused; if (ttyinq_bytesleft(ti) < nbytes) return (-1); /* We should always be able to write it back. */ - DBGSET(ret, ttyinq_write(ti, buf, nbytes, quote)); + 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 6bfa8d227ef1..70d6be3062b2 100644 --- a/sys/kern/tty_outq.c +++ b/sys/kern/tty_outq.c @@ -324,15 +324,13 @@ 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 + size_t ret __unused; if (ttyoutq_bytesleft(to) < nbytes) return (-1); /* We should always be able to write it back. */ - DBGSET(ret, ttyoutq_write(to, buf, nbytes)); + ret = ttyoutq_write(to, buf, nbytes); MPASS(ret == nbytes); return (0);