From 3745cc73d048c1331d5f349d25f5a0b5197a340a Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Fri, 8 Jan 2010 15:44:49 +0000 Subject: [PATCH] Replace several instances of 'if (!a & b)' with 'if (!(a &b))' in order to silence newer GCC versions. --- sys/ddb/db_ps.c | 4 ++-- sys/dev/ep/if_ep.c | 2 +- sys/dev/ex/if_ex.c | 2 +- sys/netinet6/ip6_input.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c index e233a26cd59e..2261721471de 100644 --- a/sys/ddb/db_ps.c +++ b/sys/ddb/db_ps.c @@ -136,7 +136,7 @@ db_ps(db_expr_t addr, boolean_t hasaddr, db_expr_t count, char *modif) 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, db_expr_t count, char *modif) 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)); diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index a1bbb01cefc4..59dd1c4cc99a 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -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 diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index 7a3d74fbc19a..d9e0c98f9fa1 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -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); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index fc26cffeb9db..c244f374b92b 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1406,7 +1406,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) 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,