svn commit: r333850 - head/sys/kern

Matt Macy mmacy at FreeBSD.org
Sat May 19 04:48:27 UTC 2018


Author: mmacy
Date: Sat May 19 04:48:26 2018
New Revision: 333850
URL: https://svnweb.freebsd.org/changeset/base/333850

Log:
  tty: use __unused annotation instead to silence warnings

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:47:34 2018	(r333849)
+++ head/sys/kern/tty_inq.c	Sat May 19 04:48:26 2018	(r333850)
@@ -328,15 +328,13 @@ 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
+	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);

Modified: head/sys/kern/tty_outq.c
==============================================================================
--- head/sys/kern/tty_outq.c	Sat May 19 04:47:34 2018	(r333849)
+++ head/sys/kern/tty_outq.c	Sat May 19 04:48:26 2018	(r333850)
@@ -324,15 +324,13 @@ 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
+	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);


More information about the svn-src-head mailing list