svn commit: r201794 - in head/sys: ddb dev/ep dev/ex netinet6

Edward Tomasz Napierala trasz at FreeBSD.org
Fri Jan 8 15:44:50 UTC 2010


Author: trasz
Date: Fri Jan  8 15:44:49 2010
New Revision: 201794
URL: http://svn.freebsd.org/changeset/base/201794

Log:
  Replace several instances of 'if (!a & b)' with 'if (!(a &b))' in order
  to silence newer GCC versions.

Modified:
  head/sys/ddb/db_ps.c
  head/sys/dev/ep/if_ep.c
  head/sys/dev/ex/if_ex.c
  head/sys/netinet6/ip6_input.c

Modified: head/sys/ddb/db_ps.c
==============================================================================
--- head/sys/ddb/db_ps.c	Fri Jan  8 15:41:24 2010	(r201793)
+++ head/sys/ddb/db_ps.c	Fri Jan  8 15:44:49 2010	(r201794)
@@ -136,7 +136,7 @@ db_ps(db_expr_t addr, boolean_t hasaddr,
 					if (TD_ON_LOCK(td))
 						lflag++;
 					if (TD_IS_SLEEPING(td)) {
-						if (!td->td_flags & TDF_SINTR)
+						if (!(td->td_flags & TDF_SINTR))
 							dflag++;
 						else
 							sflag++;
@@ -171,7 +171,7 @@ db_ps(db_expr_t addr, boolean_t hasaddr,
 		state[1] = '\0';
 
 		/* Additional process state flags. */
-		if (!p->p_flag & P_INMEM)
+		if (!(p->p_flag & P_INMEM))
 			strlcat(state, "W", sizeof(state));
 		if (p->p_flag & P_TRACED)
 			strlcat(state, "X", sizeof(state));

Modified: head/sys/dev/ep/if_ep.c
==============================================================================
--- head/sys/dev/ep/if_ep.c	Fri Jan  8 15:41:24 2010	(r201793)
+++ head/sys/dev/ep/if_ep.c	Fri Jan  8 15:44:49 2010	(r201794)
@@ -815,7 +815,7 @@ read_again:
 #endif
 		EP_FRST(sc, F_RX_FIRST);
 		status = CSR_READ_2(sc, EP_W1_RX_STATUS);
-		if (!status & ERR_RX_INCOMPLETE) {
+		if (!(status & ERR_RX_INCOMPLETE)) {
 			/*
 			 * We see if by now, the packet has completly
 			 * arrived

Modified: head/sys/dev/ex/if_ex.c
==============================================================================
--- head/sys/dev/ex/if_ex.c	Fri Jan  8 15:41:24 2010	(r201793)
+++ head/sys/dev/ex/if_ex.c	Fri Jan  8 15:44:49 2010	(r201794)
@@ -677,7 +677,7 @@ ex_tx_intr(struct ex_softc *sc)
 	while (sc->tx_head != sc->tx_tail) {
 		CSR_WRITE_2(sc, HOST_ADDR_REG, sc->tx_head);
 
-		if (! CSR_READ_2(sc, IO_PORT_REG) & Done_bit)
+		if (!(CSR_READ_2(sc, IO_PORT_REG) & Done_bit))
 			break;
 
 		tx_status = CSR_READ_2(sc, IO_PORT_REG);

Modified: head/sys/netinet6/ip6_input.c
==============================================================================
--- head/sys/netinet6/ip6_input.c	Fri Jan  8 15:41:24 2010	(r201793)
+++ head/sys/netinet6/ip6_input.c	Fri Jan  8 15:44:49 2010	(r201794)
@@ -1406,7 +1406,7 @@ ip6_savecontrol(struct inpcb *in6p, stru
 					mp = &(*mp)->m_next;
 				break;
 			case IPPROTO_ROUTING:
-				if (!in6p->inp_flags & IN6P_RTHDR)
+				if (!(in6p->inp_flags & IN6P_RTHDR))
 					break;
 
 				*mp = sbcreatecontrol((caddr_t)ip6e, elen,


More information about the svn-src-all mailing list