svn commit: r333866 - head/sys/kern

[Matt Macy]

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);
 }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"