diff options
author | peter <peter@FreeBSD.org> | 1999-05-06 18:13:11 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-05-06 18:13:11 +0000 |
commit | 73556bfee1b1d6dfc2a2f5d400228ca90bb34fc9 (patch) | |
tree | cd23f4c8f0d180abffffaece640b7971fd1103e2 /sys/dev | |
parent | ff951279f971ed62682d7071d202a8e45e6e32a4 (diff) | |
download | FreeBSD-src-73556bfee1b1d6dfc2a2f5d400228ca90bb34fc9.zip FreeBSD-src-73556bfee1b1d6dfc2a2f5d400228ca90bb34fc9.tar.gz |
Add sufficient braces to keep egcs happy about potentially ambiguous
if/else nesting.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/lnc/if_lnc.c | 6 | ||||
-rw-r--r-- | sys/dev/mse/mse.c | 6 | ||||
-rw-r--r-- | sys/dev/pdq/pdq.c | 5 | ||||
-rw-r--r-- | sys/dev/snp/snp.c | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index b02c065..c102444 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_lnc.c,v 1.56 1999/04/18 01:37:19 paul Exp $ + * $Id: if_lnc.c,v 1.57 1999/04/18 01:49:16 paul Exp $ */ /* @@ -1708,13 +1708,13 @@ lnc_start(struct ifnet *ifp) */ - if (no_entries_needed > (NDESC(sc->ntdre) - sc->pending_transmits)) + if (no_entries_needed > (NDESC(sc->ntdre) - sc->pending_transmits)) { if (!(head = chain_to_cluster(head))) { log(LOG_ERR, "lnc%d: Couldn't get mbuf for transmit packet -- Resetting \n ",ifp->if_unit); lnc_reset(sc); return; } - else if ((sc->nic.ic == LANCE) || (sc->nic.ic == C_LANCE)) { + } else if ((sc->nic.ic == LANCE) || (sc->nic.ic == C_LANCE)) { if ((head->m_len < 100) && (head->m_next)) { len = 100 - head->m_len; if (M_TRAILINGSPACE(head) < len) { diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index 836ec9c..001da0c 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.39 1998/10/22 05:58:39 bde Exp $ + * $Id: mse.c,v 1.40 1999/04/28 10:52:43 dt Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -528,7 +528,7 @@ msepoll(dev, events, p) int revents = 0; s = spltty(); - if (events & (POLLIN | POLLRDNORM)) + if (events & (POLLIN | POLLRDNORM)) { if (sc->sc_bytesread != sc->mode.packetsize || sc->sc_deltax != 0 || sc->sc_deltay != 0 || (sc->sc_obuttons ^ sc->sc_buttons) != 0) @@ -540,7 +540,7 @@ msepoll(dev, events, p) */ selrecord(p, &sc->sc_selp); } - + } splx(s); return (revents); } diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c index 1a8fcae..cb0e531 100644 --- a/sys/dev/pdq/pdq.c +++ b/sys/dev/pdq/pdq.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pdq.c,v 1.2 1997/01/17 23:54:31 joerg Exp $ + * $Id: pdq.c,v 1.3 1999/01/27 19:35:33 dillon Exp $ * */ @@ -752,8 +752,9 @@ pdq_process_received_data( status.rxs_rcc_reason, status.rxs_fsc, status.rxs_fsb_e)); if (status.rxs_rcc_reason == 7) goto discard_frame; - if (status.rxs_rcc_reason != 0) + if (status.rxs_rcc_reason != 0) { /* hardware fault */ + } if (status.rxs_rcc_badcrc) { printf(PDQ_OS_PREFIX " MAC CRC error (source=%x-%x-%x-%x-%x-%x)\n", PDQ_OS_PREFIX_ARGS, diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 0a1438d..ebffb2a 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -497,12 +497,12 @@ snppoll(dev, events, p) * Caller should see if we down via FIONREAD ioctl().The last should * return -1 to indicate down state. */ - if (events & (POLLIN | POLLRDNORM)) + if (events & (POLLIN | POLLRDNORM)) { if (snp->snp_flags & SNOOP_DOWN || snp->snp_len > 0) revents |= events & (POLLIN | POLLRDNORM); else selrecord(p, &snp->snp_sel); - + } return (revents); } |