Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 May 2018 05:37:58 +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: r333866 - head/sys/kern
Message-ID:  <201805190537.w4J5bwxR068934@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help

Author: mmacy
Date: Sat May 19 05:37:58 2018
New Revision: 333866
URL: https://svnweb.freebsd.org/changeset/base/333866

Log:
  AF_UNIX: switch to annotations to avoid warnings

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Sat May 19 05:37:18 2018	(r333865)
+++ head/sys/kern/uipc_usrreq.c	Sat May 19 05:37:58 2018	(r333866)
@@ -1678,9 +1678,7 @@ static void
 unp_disconnect(struct unpcb *unp, struct unpcb *unp2)
 {
 	struct socket *so, *so2;
-#ifdef INVARIANTS
-	int freed;
-#endif
+	int freed __unused;
 
 	KASSERT(unp2 != NULL, ("unp_disconnect: unp2 == NULL"));
 
@@ -1716,15 +1714,9 @@ unp_disconnect(struct unpcb *unp, struct unpcb *unp2)
 			soisdisconnected(so2);
 		break;
 	}
-#ifdef INVARIANTS	
-	freed =
-#endif		
-		unp_pcb_rele(unp);
+	freed = unp_pcb_rele(unp);
 	MPASS(freed == 0);
-#ifdef INVARIANTS	
-	freed =
-#endif
-		unp_pcb_rele(unp2);
+	freed = unp_pcb_rele(unp2);
 	MPASS(freed == 0);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805190537.w4J5bwxR068934>