Add sufficient braces to keep egcs happy about potentially ambiguous
if/else nesting.
This commit is contained in:
parent
5f0d05904c
commit
dfd5dee1b0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=46568
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.135 1999/04/19 14:14:13 peter Exp $
|
||||
* $Id: trap.c,v 1.136 1999/04/28 01:03:26 luoqi Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1091,11 +1091,12 @@ syscall(frame)
|
||||
|
||||
default:
|
||||
bad:
|
||||
if (p->p_sysent->sv_errsize)
|
||||
if (p->p_sysent->sv_errsize) {
|
||||
if (error >= p->p_sysent->sv_errsize)
|
||||
error = -1; /* XXX */
|
||||
else
|
||||
error = p->p_sysent->sv_errtbl[error];
|
||||
}
|
||||
frame.tf_eax = error;
|
||||
frame.tf_eflags |= PSL_C;
|
||||
break;
|
||||
|
@ -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) {
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_vfsops.c,v 1.40 1999/01/27 22:42:09 dillon Exp $ */
|
||||
/* $Id: msdosfs_vfsops.c,v 1.41 1999/03/28 23:00:33 dt Exp $ */
|
||||
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
|
||||
|
||||
/*-
|
||||
@ -886,12 +886,13 @@ msdosfs_sync(mp, waitfor, cred, p)
|
||||
* If we ever switch to not updating all of the fats all the time,
|
||||
* this would be the place to update them from the first one.
|
||||
*/
|
||||
if (pmp->pm_fmod != 0)
|
||||
if (pmp->pm_fmod != 0) {
|
||||
if (pmp->pm_flags & MSDOSFSMNT_RONLY)
|
||||
panic("msdosfs_sync: rofs mod");
|
||||
else {
|
||||
/* update fats here */
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Write back each (modified) denode.
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_vnops.c,v 1.82 1999/04/27 11:16:51 phk Exp $ */
|
||||
/* $Id: msdosfs_vnops.c,v 1.83 1999/04/28 11:37:27 phk Exp $ */
|
||||
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
|
||||
|
||||
/*-
|
||||
@ -1762,12 +1762,12 @@ msdosfs_readdir(ap)
|
||||
/*
|
||||
* Set the eofflag (NFS uses it)
|
||||
*/
|
||||
if (ap->a_eofflag)
|
||||
if (ap->a_eofflag) {
|
||||
if (dep->de_FileSize - (offset - bias) <= 0)
|
||||
*ap->a_eofflag = 1;
|
||||
else
|
||||
*ap->a_eofflag = 0;
|
||||
|
||||
}
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.135 1999/04/19 14:14:13 peter Exp $
|
||||
* $Id: trap.c,v 1.136 1999/04/28 01:03:26 luoqi Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1091,11 +1091,12 @@ syscall(frame)
|
||||
|
||||
default:
|
||||
bad:
|
||||
if (p->p_sysent->sv_errsize)
|
||||
if (p->p_sysent->sv_errsize) {
|
||||
if (error >= p->p_sysent->sv_errsize)
|
||||
error = -1; /* XXX */
|
||||
else
|
||||
error = p->p_sysent->sv_errtbl[error];
|
||||
}
|
||||
frame.tf_eax = error;
|
||||
frame.tf_eflags |= PSL_C;
|
||||
break;
|
||||
|
@ -46,7 +46,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: userconfig.c,v 1.137 1999/04/24 20:20:37 peter Exp $
|
||||
** $Id: userconfig.c,v 1.138 1999/05/05 09:37:22 jkh Exp $
|
||||
**/
|
||||
|
||||
/**
|
||||
@ -1378,13 +1378,14 @@ drawline(int row, int detail, DEV_LIST *list, int inverse, char *dhelp)
|
||||
nb[58] = '\0';
|
||||
pad(nb,60);
|
||||
if (list->conflicts) /* device in conflict? */
|
||||
{
|
||||
if (inverse)
|
||||
{
|
||||
strcpy(nb+54," !nCONF!i "); /* tag conflict, careful of length */
|
||||
}else{
|
||||
strcpy(nb+54," !iCONF!n "); /* tag conflict, careful of length */
|
||||
}
|
||||
|
||||
}
|
||||
if (list->comment == DEV_DEVICE)
|
||||
{
|
||||
sprintf(db,"%s%d",list->dev,list->unit);
|
||||
@ -2522,7 +2523,7 @@ visuserconfig(void)
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: userconfig.c,v 1.137 1999/04/24 20:20:37 peter Exp $
|
||||
* $Id: userconfig.c,v 1.138 1999/05/05 09:37:22 jkh Exp $
|
||||
*/
|
||||
|
||||
#include "scbus.h"
|
||||
|
@ -24,7 +24,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: ibcs2_fcntl.c,v 1.10 1997/11/06 19:28:24 phk Exp $
|
||||
* $Id: ibcs2_fcntl.c,v 1.11 1998/02/04 04:12:28 eivind Exp $
|
||||
*/
|
||||
|
||||
#include "opt_spx_hack.h"
|
||||
@ -183,10 +183,10 @@ ibcs2_open(p, uap)
|
||||
ret = open(p, (struct open_args *)uap);
|
||||
|
||||
#ifdef SPX_HACK
|
||||
if(ret == ENXIO)
|
||||
if(!strcmp(SCARG(uap, path), "/compat/ibcs2/dev/spx"))
|
||||
if (ret == ENXIO) {
|
||||
if (!strcmp(SCARG(uap, path), "/compat/ibcs2/dev/spx"))
|
||||
ret = spx_open(p, uap);
|
||||
else
|
||||
} else
|
||||
#endif /* SPX_HACK */
|
||||
if (!ret && !noctty && SESS_LEADER(p) && !(p->p_flag & P_CONTROLT)) {
|
||||
struct filedesc *fdp = p->p_fd;
|
||||
|
@ -34,7 +34,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
/*
|
||||
* $Id: asc.c,v 1.34 1999/01/28 01:59:53 dillon Exp $
|
||||
* $Id: asc.c,v 1.35 1999/04/28 10:52:14 dt Exp $
|
||||
*/
|
||||
|
||||
#include "asc.h"
|
||||
@ -864,7 +864,7 @@ ascpoll(dev_t dev, int events, struct proc *p)
|
||||
|
||||
sps=spltty();
|
||||
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (scu->sbuf.count >0)
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
else {
|
||||
@ -877,7 +877,7 @@ ascpoll(dev_t dev, int events, struct proc *p)
|
||||
else
|
||||
scu->selp.si_pid = p->p_pid;
|
||||
}
|
||||
|
||||
}
|
||||
splx(sps);
|
||||
return 0;
|
||||
}
|
||||
|
@ -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) {
|
||||
|
@ -47,7 +47,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_ze.c,v 1.55 1998/10/22 05:58:39 bde Exp $
|
||||
* $Id: if_ze.c,v 1.56 1998/12/07 21:58:21 archie Exp $
|
||||
*/
|
||||
|
||||
/* XXX don't mix different PCCARD support code. */
|
||||
@ -982,7 +982,7 @@ ze_start(ifp)
|
||||
* See if there is room to send more data (i.e. one or both of the
|
||||
* buffers is empty).
|
||||
*/
|
||||
if (sc->data_buffered)
|
||||
if (sc->data_buffered) {
|
||||
if (sc->xmit_busy) {
|
||||
/*
|
||||
* No room. Indicate this to the outside world
|
||||
@ -999,7 +999,7 @@ ze_start(ifp)
|
||||
*/
|
||||
ze_xmit(ifp);
|
||||
}
|
||||
|
||||
}
|
||||
IF_DEQUEUE(&sc->arpcom.ac_if.if_snd, m);
|
||||
if (m == NULL) {
|
||||
/*
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -25,7 +25,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: pcaudio.c,v 1.45 1998/12/27 20:09:31 sos Exp $
|
||||
* $Id: pcaudio.c,v 1.46 1999/04/28 10:52:45 dt Exp $
|
||||
*/
|
||||
|
||||
#include "pca.h"
|
||||
@ -531,7 +531,7 @@ pcapoll(dev_t dev, int events, struct proc *p)
|
||||
|
||||
s = spltty();
|
||||
|
||||
if (events & (POLLOUT | POLLWRNORM))
|
||||
if (events & (POLLOUT | POLLWRNORM)) {
|
||||
if (!pca_status.in_use[0] || !pca_status.in_use[1] ||
|
||||
!pca_status.in_use[2])
|
||||
revents |= events & (POLLOUT | POLLWRNORM);
|
||||
@ -543,7 +543,7 @@ pcapoll(dev_t dev, int events, struct proc *p)
|
||||
else
|
||||
pca_status.wsel.si_pid = p->p_pid;
|
||||
}
|
||||
|
||||
}
|
||||
splx(s);
|
||||
return (revents);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* random_machdep.c -- A strong random number generator
|
||||
*
|
||||
* $Id: random_machdep.c,v 1.29 1998/06/21 11:33:32 bde Exp $
|
||||
* $Id: random_machdep.c,v 1.30 1999/04/21 07:26:28 peter Exp $
|
||||
*
|
||||
* Version 0.95, last modified 18-Oct-95
|
||||
*
|
||||
@ -365,12 +365,12 @@ random_poll(dev_t dev, int events, struct proc *p)
|
||||
int revents = 0;
|
||||
|
||||
s = splhigh();
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (random_state.entropy_count >= 8)
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
else
|
||||
selrecord(p, &random_state.rsel);
|
||||
|
||||
}
|
||||
splx(s);
|
||||
if (events & (POLLOUT | POLLWRNORM))
|
||||
revents |= events & (POLLOUT | POLLWRNORM); /* heh */
|
||||
|
@ -64,14 +64,14 @@ set_format(int dev, int fmt)
|
||||
|
||||
local_conversion[dev] = 0;
|
||||
|
||||
if (!(audio_devs[dev]->format_mask & fmt)) /* Not supported */
|
||||
if (!(audio_devs[dev]->format_mask & fmt)) { /* Not supported */
|
||||
if (fmt == AFMT_MU_LAW) {
|
||||
fmt = AFMT_U8;
|
||||
local_conversion[dev] = AFMT_MU_LAW;
|
||||
} else
|
||||
fmt = AFMT_U8; /* This is always supported */
|
||||
|
||||
audio_format[dev] = DMAbuf_ioctl(dev, SNDCTL_DSP_SETFMT,
|
||||
}
|
||||
audio_format[dev] = DMAbuf_ioctl(dev, SNDCTL_DSP_SETFMT,
|
||||
(ioctl_arg) fmt, 1);
|
||||
}
|
||||
if (local_conversion[dev]) /* This shadows the HW format */
|
||||
|
@ -626,13 +626,15 @@ gus_set_voice_pos(int voice, long position)
|
||||
{
|
||||
int sample_no;
|
||||
|
||||
if ((sample_no = sample_map[voice]) != -1)
|
||||
if (position < samples[sample_no].len)
|
||||
if ((sample_no = sample_map[voice]) != -1) {
|
||||
if (position < samples[sample_no].len) {
|
||||
if (voices[voice].volume_irq_mode == VMODE_START_NOTE)
|
||||
voices[voice].offset_pending = position;
|
||||
else
|
||||
gus_write_addr(0x0a, sample_ptrs[sample_no] + position,
|
||||
samples[sample_no].mode & WAVE_16_BITS);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -132,12 +132,12 @@ pas_mixer_set(int whichDev, u_int level)
|
||||
left = level & 0x7f;
|
||||
right = (level & 0x7f00) >> 8;
|
||||
|
||||
if (whichDev < SOUND_MIXER_NRDEVICES)
|
||||
if (whichDev < SOUND_MIXER_NRDEVICES) {
|
||||
if ((1 << whichDev) & rec_devices)
|
||||
mixer = P_M_MV508_INPUTMIX;
|
||||
else
|
||||
mixer = P_M_MV508_OUTPUTMIX;
|
||||
|
||||
}
|
||||
switch (whichDev) {
|
||||
case SOUND_MIXER_VOLUME: /* Master volume (0-63) */
|
||||
levels[whichDev] = mixer_output(right, left, 63, P_M_MV508_MASTER_A, 0);
|
||||
|
@ -247,13 +247,14 @@ dsp_speed(int speed)
|
||||
/*
|
||||
* SB models earlier than SB Pro have low limit for the input speed.
|
||||
*/
|
||||
if (open_mode != OPEN_WRITE) /* Recording is possible */
|
||||
if (sbc_major < 3) /* Limited input speed with these cards */
|
||||
if (open_mode != OPEN_WRITE) { /* Recording is possible */
|
||||
if (sbc_major < 3) { /* Limited input speed with these cards */
|
||||
if (sbc_major == 2 && sbc_minor > 0)
|
||||
max_speed = 15000;
|
||||
else
|
||||
max_speed = 13000;
|
||||
|
||||
}
|
||||
}
|
||||
if (speed > max_speed)
|
||||
speed = max_speed; /* Invalid speed */
|
||||
|
||||
@ -1084,7 +1085,7 @@ sb_dsp_init(struct address_info * hw_config)
|
||||
conf_printf(sb_dsp_operations.name, hw_config);
|
||||
|
||||
#if defined(CONFIG_SB16) && defined(CONFIG_SBPRO)
|
||||
if (!sb16) /* There is a better driver for SB16 */
|
||||
if (!sb16) { /* There is a better driver for SB16 */
|
||||
#endif /* CONFIG_SB16 && CONFIG_SBPRO */
|
||||
if (num_audiodevs < MAX_AUDIO_DEV) {
|
||||
audio_devs[my_dev = num_audiodevs++] = &sb_dsp_operations;
|
||||
@ -1104,6 +1105,9 @@ sb_dsp_init(struct address_info * hw_config)
|
||||
#endif /* JAZZ16 */
|
||||
} else
|
||||
printf("SB: Too many DSP devices available\n");
|
||||
#if defined(CONFIG_SB16) && defined(CONFIG_SBPRO)
|
||||
}
|
||||
#endif /* CONFIG_SB16 && CONFIG_SBPRO */
|
||||
#else
|
||||
conf_printf("SoundBlaster (configured without audio support)", hw_config);
|
||||
#endif
|
||||
|
@ -1691,22 +1691,22 @@ sequencer_poll (int dev, struct fileinfo *file, int events, select_table * wait)
|
||||
flags = splhigh();
|
||||
|
||||
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (!iqlen)
|
||||
selrecord(wait, &selinfo[dev]);
|
||||
else {
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
midi_sleep_flag.mode &= ~WK_SLEEP;
|
||||
}
|
||||
|
||||
if (events & (POLLOUT | POLLWRNORM))
|
||||
}
|
||||
if (events & (POLLOUT | POLLWRNORM)) {
|
||||
if (qlen >= SEQ_MAX_QUEUE)
|
||||
selrecord(wait, &selinfo[dev]);
|
||||
else {
|
||||
revents |= events & (POLLOUT | POLLWRNORM);
|
||||
seq_sleep_flag.mode &= ~WK_SLEEP;
|
||||
}
|
||||
|
||||
}
|
||||
splx(flags);
|
||||
|
||||
return (revents);
|
||||
|
@ -544,12 +544,12 @@ int twpoll(dev, events, p)
|
||||
sc = &tw_sc[TWUNIT(dev)];
|
||||
s = spltty();
|
||||
/* XXX is this correct? the original code didn't test select rw mode!! */
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if(sc->sc_nextin != sc->sc_nextout)
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
else
|
||||
selrecord(p, &sc->sc_selp);
|
||||
|
||||
}
|
||||
splx(s);
|
||||
return(revents);
|
||||
}
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94
|
||||
* $Id: kern_malloc.c,v 1.53 1999/01/21 21:54:32 msmith Exp $
|
||||
* $Id: kern_malloc.c,v 1.54 1999/01/27 21:49:56 dillon Exp $
|
||||
*/
|
||||
|
||||
#include "opt_vm.h"
|
||||
@ -348,11 +348,12 @@ free(addr, type)
|
||||
freep->type = type;
|
||||
#endif /* INVARIANTS */
|
||||
kup->ku_freecnt++;
|
||||
if (kup->ku_freecnt >= kbp->kb_elmpercl)
|
||||
if (kup->ku_freecnt >= kbp->kb_elmpercl) {
|
||||
if (kup->ku_freecnt > kbp->kb_elmpercl)
|
||||
panic("free: multiple frees");
|
||||
else if (kbp->kb_totalfree > kbp->kb_highwat)
|
||||
kbp->kb_couldfree++;
|
||||
}
|
||||
kbp->kb_totalfree++;
|
||||
ksp->ks_memuse -= size;
|
||||
if (ksp->ks_memuse + size >= ksp->ks_limit &&
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_proc.c 8.7 (Berkeley) 2/14/95
|
||||
* $Id: kern_proc.c,v 1.47 1999/04/28 11:36:57 phk Exp $
|
||||
* $Id: kern_proc.c,v 1.48 1999/05/03 23:57:21 billf Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -321,11 +321,12 @@ fixjobc(p, pgrp, entering)
|
||||
* group; if so, adjust count for p's process group.
|
||||
*/
|
||||
if ((hispgrp = p->p_pptr->p_pgrp) != pgrp &&
|
||||
hispgrp->pg_session == mysession)
|
||||
hispgrp->pg_session == mysession) {
|
||||
if (entering)
|
||||
pgrp->pg_jobc++;
|
||||
else if (--pgrp->pg_jobc == 0)
|
||||
orphanpg(pgrp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check this process' children to see whether they qualify
|
||||
@ -335,11 +336,12 @@ fixjobc(p, pgrp, entering)
|
||||
for (p = p->p_children.lh_first; p != 0; p = p->p_sibling.le_next)
|
||||
if ((hispgrp = p->p_pgrp) != pgrp &&
|
||||
hispgrp->pg_session == mysession &&
|
||||
p->p_stat != SZOMB)
|
||||
p->p_stat != SZOMB) {
|
||||
if (entering)
|
||||
hispgrp->pg_jobc++;
|
||||
else if (--hispgrp->pg_jobc == 0)
|
||||
orphanpg(hispgrp);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* random_machdep.c -- A strong random number generator
|
||||
*
|
||||
* $Id: random_machdep.c,v 1.29 1998/06/21 11:33:32 bde Exp $
|
||||
* $Id: random_machdep.c,v 1.30 1999/04/21 07:26:28 peter Exp $
|
||||
*
|
||||
* Version 0.95, last modified 18-Oct-95
|
||||
*
|
||||
@ -365,12 +365,12 @@ random_poll(dev_t dev, int events, struct proc *p)
|
||||
int revents = 0;
|
||||
|
||||
s = splhigh();
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (random_state.entropy_count >= 8)
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
else
|
||||
selrecord(p, &random_state.rsel);
|
||||
|
||||
}
|
||||
splx(s);
|
||||
if (events & (POLLOUT | POLLWRNORM))
|
||||
revents |= events & (POLLOUT | POLLWRNORM); /* heh */
|
||||
|
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94
|
||||
* $Id: kern_shutdown.c,v 1.47 1999/04/27 11:16:04 phk Exp $
|
||||
* $Id: kern_shutdown.c,v 1.48 1999/05/03 23:57:22 billf Exp $
|
||||
*/
|
||||
|
||||
#include "opt_ddb.h"
|
||||
@ -233,12 +233,13 @@ boot(howto)
|
||||
*/
|
||||
nbusy = 0;
|
||||
for (bp = &buf[nbuf]; --bp >= buf; ) {
|
||||
if (((bp->b_flags & (B_BUSY | B_INVAL)) == B_BUSY)
|
||||
||((bp->b_flags & (B_DELWRI | B_INVAL))== B_DELWRI))
|
||||
if (((bp->b_flags & (B_BUSY | B_INVAL)) == B_BUSY) ||
|
||||
((bp->b_flags & (B_DELWRI | B_INVAL))== B_DELWRI)) {
|
||||
if(bp->b_dev == NODEV)
|
||||
CIRCLEQ_REMOVE(&mountlist, bp->b_vp->v_mount, mnt_list);
|
||||
else
|
||||
nbusy++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)subr_log.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: subr_log.c,v 1.32 1998/11/11 10:55:56 truckman Exp $
|
||||
* $Id: subr_log.c,v 1.33 1998/12/07 21:58:29 archie Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -167,12 +167,12 @@ logpoll(dev, events, p)
|
||||
|
||||
s = splhigh();
|
||||
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (msgbufp->msg_bufr != msgbufp->msg_bufx)
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
else
|
||||
selrecord(p, &logsoftc.sc_selp);
|
||||
|
||||
}
|
||||
splx(s);
|
||||
return (revents);
|
||||
}
|
||||
|
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.135 1999/04/19 14:14:13 peter Exp $
|
||||
* $Id: trap.c,v 1.136 1999/04/28 01:03:26 luoqi Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1091,11 +1091,12 @@ syscall(frame)
|
||||
|
||||
default:
|
||||
bad:
|
||||
if (p->p_sysent->sv_errsize)
|
||||
if (p->p_sysent->sv_errsize) {
|
||||
if (error >= p->p_sysent->sv_errsize)
|
||||
error = -1; /* XXX */
|
||||
else
|
||||
error = p->p_sysent->sv_errtbl[error];
|
||||
}
|
||||
frame.tf_eax = error;
|
||||
frame.tf_eflags |= PSL_C;
|
||||
break;
|
||||
|
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tty.c 8.8 (Berkeley) 1/21/94
|
||||
* $Id: tty.c,v 1.115 1999/02/19 19:34:49 luoqi Exp $
|
||||
* $Id: tty.c,v 1.116 1999/04/27 11:16:17 phk Exp $
|
||||
*/
|
||||
|
||||
/*-
|
||||
@ -1069,19 +1069,20 @@ ttypoll(tp, events, p)
|
||||
| POLLHUP);
|
||||
|
||||
s = spltty();
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (ttnread(tp) > 0 || ISSET(tp->t_state, TS_ZOMBIE))
|
||||
revents |= events & (POLLIN | POLLRDNORM);
|
||||
else
|
||||
selrecord(p, &tp->t_rsel);
|
||||
|
||||
if (events & (POLLOUT | POLLWRNORM))
|
||||
}
|
||||
if (events & (POLLOUT | POLLWRNORM)) {
|
||||
if ((tp->t_outq.c_cc <= tp->t_olowat &&
|
||||
ISSET(tp->t_state, TS_CONNECTED))
|
||||
|| ISSET(tp->t_state, TS_ZOMBIE))
|
||||
revents |= events & (POLLOUT | POLLWRNORM);
|
||||
else
|
||||
selrecord(p, &tp->t_wsel);
|
||||
}
|
||||
splx(s);
|
||||
return (revents);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_vfsops.c,v 1.40 1999/01/27 22:42:09 dillon Exp $ */
|
||||
/* $Id: msdosfs_vfsops.c,v 1.41 1999/03/28 23:00:33 dt Exp $ */
|
||||
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
|
||||
|
||||
/*-
|
||||
@ -886,12 +886,13 @@ msdosfs_sync(mp, waitfor, cred, p)
|
||||
* If we ever switch to not updating all of the fats all the time,
|
||||
* this would be the place to update them from the first one.
|
||||
*/
|
||||
if (pmp->pm_fmod != 0)
|
||||
if (pmp->pm_fmod != 0) {
|
||||
if (pmp->pm_flags & MSDOSFSMNT_RONLY)
|
||||
panic("msdosfs_sync: rofs mod");
|
||||
else {
|
||||
/* update fats here */
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Write back each (modified) denode.
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: msdosfs_vnops.c,v 1.82 1999/04/27 11:16:51 phk Exp $ */
|
||||
/* $Id: msdosfs_vnops.c,v 1.83 1999/04/28 11:37:27 phk Exp $ */
|
||||
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
|
||||
|
||||
/*-
|
||||
@ -1762,12 +1762,12 @@ msdosfs_readdir(ap)
|
||||
/*
|
||||
* Set the eofflag (NFS uses it)
|
||||
*/
|
||||
if (ap->a_eofflag)
|
||||
if (ap->a_eofflag) {
|
||||
if (dep->de_FileSize - (offset - bias) <= 0)
|
||||
*ap->a_eofflag = 1;
|
||||
else
|
||||
*ap->a_eofflag = 0;
|
||||
|
||||
}
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
@ -657,7 +657,7 @@ tunpoll(dev, events, p)
|
||||
s = splimp();
|
||||
TUNDEBUG("%s%d: tunpoll\n", ifp->if_name, ifp->if_unit);
|
||||
|
||||
if (events & (POLLIN | POLLRDNORM))
|
||||
if (events & (POLLIN | POLLRDNORM)) {
|
||||
if (ifp->if_snd.ifq_len > 0) {
|
||||
TUNDEBUG("%s%d: tunpoll q=%d\n", ifp->if_name,
|
||||
ifp->if_unit, ifp->if_snd.ifq_len);
|
||||
@ -667,7 +667,7 @@ tunpoll(dev, events, p)
|
||||
ifp->if_unit);
|
||||
selrecord(p, &tp->tun_rsel);
|
||||
}
|
||||
|
||||
}
|
||||
if (events & (POLLOUT | POLLWRNORM))
|
||||
revents |= events & (POLLOUT | POLLWRNORM);
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* From: @(#)if.h 8.1 (Berkeley) 6/10/93
|
||||
* $Id: if_var.h,v 1.10 1998/12/16 18:30:43 phk Exp $
|
||||
* $Id: if_var.h,v 1.11 1999/04/16 21:22:46 peter Exp $
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_VAR_H_
|
||||
@ -277,10 +277,12 @@ struct ifmultiaddr {
|
||||
|
||||
#ifdef KERNEL
|
||||
#define IFAFREE(ifa) \
|
||||
if ((ifa)->ifa_refcnt <= 0) \
|
||||
ifafree(ifa); \
|
||||
else \
|
||||
(ifa)->ifa_refcnt--;
|
||||
do { \
|
||||
if ((ifa)->ifa_refcnt <= 0) \
|
||||
ifafree(ifa); \
|
||||
else \
|
||||
(ifa)->ifa_refcnt--; \
|
||||
} while (0)
|
||||
|
||||
extern struct ifnethead ifnet;
|
||||
extern int ifqmaxlen;
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)route.h 8.3 (Berkeley) 4/19/94
|
||||
* $Id: route.h,v 1.27 1997/09/07 05:26:27 bde Exp $
|
||||
* $Id: route.h,v 1.28 1998/03/23 13:58:02 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _NET_ROUTE_H_
|
||||
@ -255,10 +255,12 @@ struct route_cb {
|
||||
|
||||
#ifdef KERNEL
|
||||
#define RTFREE(rt) \
|
||||
if ((rt)->rt_refcnt <= 1) \
|
||||
rtfree(rt); \
|
||||
else \
|
||||
(rt)->rt_refcnt--;
|
||||
do { \
|
||||
if ((rt)->rt_refcnt <= 1) \
|
||||
rtfree(rt); \
|
||||
else \
|
||||
(rt)->rt_refcnt--; \
|
||||
} while (0)
|
||||
|
||||
extern struct route_cb route_cb;
|
||||
extern struct radix_node_head *rt_tables[AF_MAX+1];
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)if_ether.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: if_ether.c,v 1.56 1999/03/10 10:11:43 julian Exp $
|
||||
* $Id: if_ether.c,v 1.57 1999/04/15 17:58:24 eivind Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -544,7 +544,7 @@ in_arpinput(m)
|
||||
}
|
||||
#endif
|
||||
if (sdl->sdl_alen &&
|
||||
bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen))
|
||||
bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen)) {
|
||||
if (rt->rt_expire)
|
||||
log(LOG_INFO, "arp: %s moved from %6D to %6D on %s%d\n",
|
||||
inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
|
||||
@ -557,6 +557,7 @@ in_arpinput(m)
|
||||
ac->ac_if.if_name, ac->ac_if.if_unit);
|
||||
goto reply;
|
||||
}
|
||||
}
|
||||
(void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
|
||||
sdl->sdl_alen = sizeof(ea->arp_sha);
|
||||
sdl->sdl_rcf = NULL;
|
||||
|
@ -9,7 +9,7 @@
|
||||
* Modified by Bill Fenner, PARC, April 1995
|
||||
*
|
||||
* MROUTING Revision: 3.5
|
||||
* $Id: ip_mroute.c,v 1.52 1999/01/12 12:16:50 eivind Exp $
|
||||
* $Id: ip_mroute.c,v 1.53 1999/01/18 02:06:57 fenner Exp $
|
||||
*/
|
||||
|
||||
#include "opt_mrouting.h"
|
||||
@ -2195,13 +2195,14 @@ rsvp_input(m, iphlen)
|
||||
printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
|
||||
m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
|
||||
|
||||
if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0)
|
||||
if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0) {
|
||||
if (rsvpdebug)
|
||||
printf("rsvp_input: Failed to append to socket\n");
|
||||
else
|
||||
} else {
|
||||
if (rsvpdebug)
|
||||
printf("rsvp_input: send packet up\n");
|
||||
|
||||
}
|
||||
|
||||
splx(s);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
|
||||
* $Id: tcp_input.c,v 1.84 1999/02/06 00:47:45 fenner Exp $
|
||||
* $Id: tcp_input.c,v 1.85 1999/05/03 23:57:30 billf Exp $
|
||||
*/
|
||||
|
||||
#include "opt_ipfw.h" /* for ipfw_fwd */
|
||||
@ -844,11 +844,12 @@ tcp_input(m, iphlen)
|
||||
* we don't get fooled into using T/TCP.
|
||||
*/
|
||||
if (to.to_flag & TOF_CCECHO) {
|
||||
if (tp->cc_send != to.to_ccecho)
|
||||
if (tp->cc_send != to.to_ccecho) {
|
||||
if (taop->tao_ccsent != 0)
|
||||
goto drop;
|
||||
else
|
||||
goto dropwithreset;
|
||||
}
|
||||
} else
|
||||
tp->t_flags &= ~TF_RCVD_CC;
|
||||
tcpstat.tcps_connects++;
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
|
||||
* $Id: tcp_input.c,v 1.84 1999/02/06 00:47:45 fenner Exp $
|
||||
* $Id: tcp_input.c,v 1.85 1999/05/03 23:57:30 billf Exp $
|
||||
*/
|
||||
|
||||
#include "opt_ipfw.h" /* for ipfw_fwd */
|
||||
@ -844,11 +844,12 @@ tcp_input(m, iphlen)
|
||||
* we don't get fooled into using T/TCP.
|
||||
*/
|
||||
if (to.to_flag & TOF_CCECHO) {
|
||||
if (tp->cc_send != to.to_ccecho)
|
||||
if (tp->cc_send != to.to_ccecho) {
|
||||
if (taop->tao_ccsent != 0)
|
||||
goto drop;
|
||||
else
|
||||
goto dropwithreset;
|
||||
}
|
||||
} else
|
||||
tp->t_flags &= ~TF_RCVD_CC;
|
||||
tcpstat.tcps_connects++;
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95
|
||||
* $Id: nfs_serv.c,v 1.74 1999/04/27 11:17:49 phk Exp $
|
||||
* $Id: nfs_serv.c,v 1.75 1999/04/28 11:37:54 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1921,11 +1921,12 @@ nfsrv_rename(nfsd, slp, procp, mrq)
|
||||
error = ENOTEMPTY;
|
||||
goto out;
|
||||
}
|
||||
if (fvp == tdvp)
|
||||
if (fvp == tdvp) {
|
||||
if (v3)
|
||||
error = EINVAL;
|
||||
else
|
||||
error = ENOTEMPTY;
|
||||
}
|
||||
/*
|
||||
* If source is the same as the destination (that is the
|
||||
* same vnode with the same name in the same directory),
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
|
||||
* $Id: nfs_vnops.c,v 1.125 1999/05/02 23:56:26 alc Exp $
|
||||
* $Id: nfs_vnops.c,v 1.126 1999/05/03 20:59:14 alc Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -2543,11 +2543,12 @@ nfs_lookitup(dvp, name, len, cred, procp, npp)
|
||||
nfsm_reqdone;
|
||||
if (npp && *npp == NULL) {
|
||||
if (error) {
|
||||
if (newvp)
|
||||
if (newvp) {
|
||||
if (newvp == dvp)
|
||||
vrele(newvp);
|
||||
else
|
||||
vput(newvp);
|
||||
}
|
||||
} else
|
||||
*npp = np;
|
||||
}
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
|
||||
* $Id: nfs_vnops.c,v 1.125 1999/05/02 23:56:26 alc Exp $
|
||||
* $Id: nfs_vnops.c,v 1.126 1999/05/03 20:59:14 alc Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -2543,11 +2543,12 @@ nfs_lookitup(dvp, name, len, cred, procp, npp)
|
||||
nfsm_reqdone;
|
||||
if (npp && *npp == NULL) {
|
||||
if (error) {
|
||||
if (newvp)
|
||||
if (newvp) {
|
||||
if (newvp == dvp)
|
||||
vrele(newvp);
|
||||
else
|
||||
vput(newvp);
|
||||
}
|
||||
} else
|
||||
*npp = np;
|
||||
}
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95
|
||||
* $Id: nfs_serv.c,v 1.74 1999/04/27 11:17:49 phk Exp $
|
||||
* $Id: nfs_serv.c,v 1.75 1999/04/28 11:37:54 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1921,11 +1921,12 @@ nfsrv_rename(nfsd, slp, procp, mrq)
|
||||
error = ENOTEMPTY;
|
||||
goto out;
|
||||
}
|
||||
if (fvp == tdvp)
|
||||
if (fvp == tdvp) {
|
||||
if (v3)
|
||||
error = EINVAL;
|
||||
else
|
||||
error = ENOTEMPTY;
|
||||
}
|
||||
/*
|
||||
* If source is the same as the destination (that is the
|
||||
* same vnode with the same name in the same directory),
|
||||
|
@ -29,7 +29,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_tl.c,v 1.29 1999/04/24 20:14:01 peter Exp $
|
||||
* $Id: if_tl.c,v 1.30 1999/05/06 15:32:49 wpaul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -221,7 +221,7 @@
|
||||
|
||||
#if !defined(lint)
|
||||
static const char rcsid[] =
|
||||
"$Id: if_tl.c,v 1.29 1999/04/24 20:14:01 peter Exp $";
|
||||
"$Id: if_tl.c,v 1.30 1999/05/06 15:32:49 wpaul Exp $";
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -1411,10 +1411,10 @@ static int tl_attach_phy(sc)
|
||||
|
||||
if (sc->tl_phy_sts & PHY_BMSR_100BT4 ||
|
||||
sc->tl_phy_sts & PHY_BMSR_100BTXHALF ||
|
||||
sc->tl_phy_sts & PHY_BMSR_100BTXHALF)
|
||||
sc->tl_phy_sts & PHY_BMSR_100BTXHALF) {
|
||||
if (bootverbose)
|
||||
printf("10/100Mbps ");
|
||||
else {
|
||||
} else {
|
||||
media &= ~IFM_100_TX;
|
||||
media |= IFM_10_T;
|
||||
if (bootverbose)
|
||||
@ -1422,10 +1422,10 @@ static int tl_attach_phy(sc)
|
||||
}
|
||||
|
||||
if (sc->tl_phy_sts & PHY_BMSR_100BTXFULL ||
|
||||
sc->tl_phy_sts & PHY_BMSR_10BTFULL)
|
||||
sc->tl_phy_sts & PHY_BMSR_10BTFULL) {
|
||||
if (bootverbose)
|
||||
printf("full duplex ");
|
||||
else {
|
||||
} else {
|
||||
if (bootverbose)
|
||||
printf("half duplex ");
|
||||
media &= ~IFM_FDX;
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95
|
||||
* $Id: ffs_alloc.c,v 1.55 1999/01/06 17:04:33 bde Exp $
|
||||
* $Id: ffs_alloc.c,v 1.56 1999/01/07 16:14:16 bde Exp $
|
||||
*/
|
||||
|
||||
#include "opt_quota.h"
|
||||
@ -505,11 +505,12 @@ ffs_reallocblks(ap)
|
||||
if (!doasyncfree)
|
||||
UFS_UPDATE(vp, 1);
|
||||
}
|
||||
if (ssize < len)
|
||||
if (ssize < len) {
|
||||
if (doasyncfree)
|
||||
bdwrite(ebp);
|
||||
else
|
||||
bwrite(ebp);
|
||||
}
|
||||
/*
|
||||
* Last, free the old blocks and assign the new blocks to the buffers.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user