Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some braces to stop the new egcs warnings.

This commit is contained in:
veego 1998-08-20 19:55:06 +00:00
parent 8652696101
commit ff2c3adddc
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/amiga/amiga/cc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cc.c,v 1.11 1997/06/23 23:46:23 is Exp $ */
/* $NetBSD: cc.c,v 1.12 1998/08/20 19:55:06 veego Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -439,11 +439,12 @@ play_sample(len, data, period, volume, channels, count)
/* check to see, whether all channels are free */
for (i=0;i<4;i++) {
if ((1<<i)&dmabits)
if ((1<<i) & dmabits) {
if (channel[i].isaudio)
return; /* allocated */
else
channel[i].isaudio=-1; /* allocate */
}
}
custom.dmacon = dmabits; /* turn off the correct channels */

5
sys/arch/amiga/amiga/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.122 1998/07/26 06:45:17 is Exp $ */
/* $NetBSD: machdep.c,v 1.123 1998/08/20 19:55:06 veego Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -338,12 +338,13 @@ again:
* 5% of remaining. Insure a minimum of 16 buffers.
* We allocate 3/4 as many swap buffer headers as file i/o buffers.
*/
if (bufpages == 0)
if (bufpages == 0) {
if (physmem < btoc(2 * 1024 * 1024))
bufpages = physmem / (10 * CLSIZE);
else
bufpages = (btoc(2 * 1024 * 1024) + physmem) /
(20 * CLSIZE);
}
if (nbuf == 0) {
nbuf = bufpages;

5
sys/arch/i386/isa/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.40 1998/08/15 03:02:39 mycroft Exp $ */
/* $NetBSD: pms.c,v 1.41 1998/08/20 19:55:06 veego Exp $ */
/*-
* Copyright (c) 1994, 1997 Charles M. Hannum.
@ -674,11 +674,12 @@ pmspoll(dev, events, p)
int revents = 0;
int s = spltty();
if (events & (POLLIN | POLLRDNORM))
if (events & (POLLIN | POLLRDNORM)) {
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
selrecord(p, &sc->sc_rsel);
}
splx(s);
return (revents);

10
sys/dev/pci/ncr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.70 1998/08/13 02:10:54 eeh Exp $ */
/* $NetBSD: ncr.c,v 1.71 1998/08/20 19:55:07 veego Exp $ */
/**************************************************************************
**
@ -1434,7 +1434,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0
static char ident[] =
"\n$NetBSD: ncr.c,v 1.70 1998/08/13 02:10:54 eeh Exp $\n";
"\n$NetBSD: ncr.c,v 1.71 1998/08/20 19:55:07 veego Exp $\n";
#endif
static const u_long ncr_version = NCR_VERSION * 11
@ -3932,7 +3932,7 @@ static void ncr_attach (pcici_t config_id, int unit)
/*
** Get on-chip SRAM address, if supported
*/
if ((np->features & FE_RAM) && sizeof(struct script) <= 4096)
if ((np->features & FE_RAM) && sizeof(struct script) <= 4096) {
#ifdef __NetBSD__
if (pci_mapreg_map(pa, 0x18,
PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
@ -3941,11 +3941,13 @@ static void ncr_attach (pcici_t config_id, int unit)
np->ram_handle = memh;
np->paddr2 = memaddr;
np->scriptmapped = 1;
} else
} else {
np->scriptmapped = 0;
}
#else /* !__NetBSD__ */
(void)(!pci_map_mem (config_id,0x18, &np->vaddr2, &np->paddr2));
#endif /* __NetBSD__ */
}
#endif /* !NCR_IOMAPPED */
/*

5
sys/dev/usb/uhid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uhid.c,v 1.3 1998/08/01 20:52:45 augustss Exp $ */
/* $NetBSD: uhid.c,v 1.4 1998/08/20 19:55:07 veego Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -506,11 +506,12 @@ uhidpoll(dev, events, p)
s = spltty();
if (events & (POLLOUT | POLLWRNORM))
revents |= events & (POLLOUT | POLLWRNORM);
if (events & (POLLIN | POLLRDNORM))
if (events & (POLLIN | POLLRDNORM)) {
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
selrecord(p, &sc->sc_rsel);
}
splx(s);
return (revents);

5
sys/net/if_tun.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tun.c,v 1.34 1998/07/05 06:49:17 jonathan Exp $ */
/* $NetBSD: if_tun.c,v 1.35 1998/08/20 19:55:07 veego Exp $ */
/*
* Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
@ -658,7 +658,7 @@ tunpoll(dev, events, p)
s = splimp();
TUNDEBUG("%s: tunpoll\n", ifp->if_xname);
if (events & (POLLIN | POLLRDNORM))
if (events & (POLLIN | POLLRDNORM)) {
if (ifp->if_snd.ifq_len > 0) {
TUNDEBUG("%s: tunpoll q=%d\n", ifp->if_xname,
ifp->if_snd.ifq_len);
@ -667,6 +667,7 @@ tunpoll(dev, events, p)
TUNDEBUG("%s: tunpoll waiting\n", ifp->if_xname);
selrecord(p, &tp->tun_rsel);
}
}
if (events & (POLLOUT | POLLWRNORM))
revents |= events & (POLLOUT | POLLWRNORM);