diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/mvme88k/ddb/db_trace.c | 4 | ||||
-rw-r--r-- | sys/arch/mvmeppc/mvmeppc/machdep.c | 4 | ||||
-rw-r--r-- | sys/arch/vax/uba/ts.c | 4 | ||||
-rw-r--r-- | sys/compat/common/compat_vm.c | 6 | ||||
-rw-r--r-- | sys/compat/ultrix/ultrix_ioctl.c | 4 | ||||
-rw-r--r-- | sys/dev/bio.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/isp_openbsd.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/twe.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/auich.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/gdt_pci.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_de.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_lge.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_nge.c | 4 | ||||
-rw-r--r-- | sys/dev/wscons/wsemul_vt100_subr.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_sysctl.c | 4 | ||||
-rw-r--r-- | sys/netiso/if_cons.c | 4 | ||||
-rw-r--r-- | sys/scsi/ses.c | 4 | ||||
-rw-r--r-- | sys/uvm/uvm_mmap.c | 4 |
18 files changed, 40 insertions, 40 deletions
diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c index 66f8e41a28a..d865ea7ec23 100644 --- a/sys/arch/mvme88k/ddb/db_trace.c +++ b/sys/arch/mvme88k/ddb/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.17 2002/12/09 00:45:37 millert Exp $ */ +/* $OpenBSD: db_trace.c,v 1.18 2003/08/06 21:08:06 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -784,7 +784,7 @@ stack_decode(unsigned addr, unsigned *stack, int (*pr)(const char *, ...)) return 0; /* bummer */ case JUMP_SOURCE_IS_UNLIKELY: - next_address_likely_wrong = 1;; + next_address_likely_wrong = 1; break; } } diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index 182992abe8b..ac7b0f6a8a9 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.31 2003/04/06 18:54:19 ho Exp $ */ +/* $OpenBSD: machdep.c,v 1.32 2003/08/06 21:08:06 millert Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -999,7 +999,7 @@ ppc_intr_establish(lcv, ih, type, level, func, arg, name) return (void *)ppc_configed_intr_cnt; } -intr_establish_t *intr_establish_func = ppc_intr_establish;; +intr_establish_t *intr_establish_func = ppc_intr_establish; intr_disestablish_t *intr_disestablish_func; void diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c index cfdd47cb9bb..a2fe2a03b33 100644 --- a/sys/arch/vax/uba/ts.c +++ b/sys/arch/vax/uba/ts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts.c,v 1.12 2003/06/02 23:27:58 millert Exp $ */ +/* $OpenBSD: ts.c,v 1.13 2003/08/06 21:08:06 millert Exp $ */ /* $NetBSD: ts.c,v 1.11 1997/01/11 11:34:43 ragge Exp $ */ /*- @@ -402,7 +402,7 @@ tscommand (dev, cmd, count) debug (("tscommand: direct return, no biowait.\n")); return; } - debug (("tscommand: calling biowait ...\n"));; + debug (("tscommand: calling biowait ...\n")); biowait (bp); if (bp->b_flags & B_WANTED) wakeup ((caddr_t)bp); diff --git a/sys/compat/common/compat_vm.c b/sys/compat/common/compat_vm.c index 33debd070f1..44d4cc96f5e 100644 --- a/sys/compat/common/compat_vm.c +++ b/sys/compat/common/compat_vm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compat_vm.c,v 1.3 2003/05/10 17:53:56 miod Exp $ */ +/* $OpenBSD: compat_vm.c,v 1.4 2003/08/06 21:08:06 millert Exp $ */ /* $NetBSD: vm_12.c,v 1.8 1997/10/20 22:05:22 thorpej Exp $ */ /* @@ -66,8 +66,8 @@ compat_25_sys_omsync(p, v, retval) syscallarg(size_t) len; } */ *uap = v; - SCARG(&ua, addr) = SCARG(uap, addr);; - SCARG(&ua, len) = SCARG(uap, len);; + SCARG(&ua, addr) = SCARG(uap, addr); + SCARG(&ua, len) = SCARG(uap, len); SCARG(&ua, flags) = MS_SYNC | MS_INVALIDATE; return (sys_msync(p, &ua, retval)); } diff --git a/sys/compat/ultrix/ultrix_ioctl.c b/sys/compat/ultrix/ultrix_ioctl.c index 71bf9544e8c..9f96b4b5a28 100644 --- a/sys/compat/ultrix/ultrix_ioctl.c +++ b/sys/compat/ultrix/ultrix_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_ioctl.c,v 1.9 2002/02/14 22:57:18 pvalchev Exp $ */ +/* $OpenBSD: ultrix_ioctl.c,v 1.10 2003/08/06 21:08:06 millert Exp $ */ /* $NetBSD: ultrix_ioctl.c,v 1.3.4.1 1996/06/13 18:22:37 jonathan Exp $ */ /* from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */ @@ -675,7 +675,7 @@ ultrix_sys_ioctl(p, v, retval) #define IFREQ_INOUT(a) { \ struct ifreq ifreq; \ if ((error = copyin (SCARG(uap, data), (caddr_t)&ifreq, sizeof (ifreq))) != 0) \ - goto out;; \ + goto out; \ if ((error = (*ctl)(fp, a, (caddr_t)&ifreq, p)) != 0) \ goto out; \ error = copyout ((caddr_t)&ifreq, SCARG(uap, data), sizeof (ifreq)); \ diff --git a/sys/dev/bio.c b/sys/dev/bio.c index 4292f96c0d2..6eb18e2129b 100644 --- a/sys/dev/bio.c +++ b/sys/dev/bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio.c,v 1.2 2003/06/03 20:49:28 deraadt Exp $ */ +/* $OpenBSD: bio.c,v 1.3 2003/08/06 21:08:06 millert Exp $ */ /* * Copyright (c) 2002 Niklas Hallqvist. All rights reserved. @@ -50,7 +50,7 @@ struct bio_softc { void bioattach(int); int bioclose(dev_t, int, int, struct proc *); int bioioctl(dev_t, u_long, caddr_t, int, struct proc *); -int bioopen(dev_t, int, int, struct proc *);; +int bioopen(dev_t, int, int, struct proc *); int bio_delegate_ioctl(struct bio_mapping *, u_long, caddr_t); struct bio_mapping *bio_lookup(char *); diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c index 24c915b44da..b6803c896d2 100644 --- a/sys/dev/ic/isp_openbsd.c +++ b/sys/dev/ic/isp_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_openbsd.c,v 1.24 2002/08/17 17:43:47 mjacob Exp $ */ +/* $OpenBSD: isp_openbsd.c,v 1.25 2003/08/06 21:08:06 millert Exp $ */ /* * Platform (OpenBSD) dependent common attachment code for Qlogic adapters. * @@ -293,7 +293,7 @@ ispcmd(XS_T *xs) timeout_set(&xs->stimeout, isp_wdog, isp); if (XS_LUN(xs) >= isp->isp_maxluns) { - xs->error = XS_SELTIMEOUT;; + xs->error = XS_SELTIMEOUT; return (COMPLETE); } @@ -690,7 +690,7 @@ isp_async(struct ispsoftc *isp, ispasync_t cmd, void *arg) bus = (tgt >> 16) & 0xffff; tgt &= 0xffff; sdp += bus; - flags = sdp->isp_devparam[tgt].actv_flags;; + flags = sdp->isp_devparam[tgt].actv_flags; period = sdp->isp_devparam[tgt].actv_period; if ((flags & DPARM_SYNC) && period && diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c index 9a76d7a5575..07eac0fb784 100644 --- a/sys/dev/ic/twe.c +++ b/sys/dev/ic/twe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe.c,v 1.21 2003/06/02 19:24:22 mickey Exp $ */ +/* $OpenBSD: twe.c,v 1.22 2003/08/06 21:08:06 millert Exp $ */ /* * Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved. @@ -183,7 +183,7 @@ twe_attach(sc) lockinit(&sc->sc_lock, PWAIT, "twelk", 0, 0); pa = sc->sc_cmdmap->dm_segs[0].ds_addr + - sizeof(struct twe_cmd) * (TWE_MAXCMDS - 1);; + sizeof(struct twe_cmd) * (TWE_MAXCMDS - 1); for (cmd = sc->sc_cmds + sizeof(struct twe_cmd) * (TWE_MAXCMDS - 1); cmd >= (struct twe_cmd *)sc->sc_cmds; cmd--, pa -= sizeof(*cmd)) { diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 2531d74f733..4f1c5d75e69 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.35 2003/06/12 18:08:09 mickey Exp $ */ +/* $OpenBSD: auich.c,v 1.36 2003/08/06 21:08:06 millert Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -163,9 +163,9 @@ struct auich_softc { struct auich_dmalist *dmalist_pcmo, *dmap_pcmo, dmasto_pcmo[AUICH_DMALIST_MAX+1]; struct auich_dmalist *dmalist_pcmi, *dmap_pcmi, - dmasto_pcmi[AUICH_DMALIST_MAX+1];; + dmasto_pcmi[AUICH_DMALIST_MAX+1]; struct auich_dmalist *dmalist_mici, *dmap_mici, - dmasto_mici[AUICH_DMALIST_MAX+1];; + dmasto_mici[AUICH_DMALIST_MAX+1]; /* i/o buffer pointers */ u_int32_t pcmo_start, pcmo_p, pcmo_end; int pcmo_blksize, pcmo_fifoe; diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index d393e058a6e..5cb1b64367d 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.18 2003/06/03 20:49:29 deraadt Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.19 2003/08/06 21:08:06 millert Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -301,7 +301,7 @@ gdt_pci_attach(parent, self, aux) #if 0 /* disable board interrupts, deinit services */ gdth_writeb(0xff, &dp6_ptr->io.irqdel); - gdth_writeb(0x00, &dp6_ptr->io.irqen);; + gdth_writeb(0x00, &dp6_ptr->io.irqen); gdth_writeb(0x00, &dp6_ptr->u.ic.S_Status); gdth_writeb(0x00, &dp6_ptr->u.ic.Cmd_Index); diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 34f5e02ba85..04f16a66cac 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.57 2003/04/06 18:54:20 ho Exp $ */ +/* $OpenBSD: if_de.c,v 1.58 2003/08/06 21:08:06 millert Exp $ */ /* $NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $ */ /*- @@ -2370,7 +2370,7 @@ tulip_identify_asante_nic( mi->mi_gpr_length = 0; mi->mi_gpr_offset = 0; mi->mi_reset_length = 0; - mi->mi_reset_offset = 0;; + mi->mi_reset_offset = 0; mi->mi_phyaddr = TULIP_MII_NOPHY; for (idx = 20; idx > 0 && mi->mi_phyaddr == TULIP_MII_NOPHY; idx--) { diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index 5d9fb4f1258..ff35bc2abbb 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.11 2002/11/26 06:01:28 nate Exp $ */ +/* $OpenBSD: if_lge.c,v 1.12 2003/08/06 21:08:07 millert Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -512,7 +512,7 @@ void lge_attach(parent, self, aux) if (!(command & PCI_COMMAND_IO_ENABLE)) { printf("%s: failed to enable I/O ports!\n", sc->sc_dv.dv_xname); - error = ENXIO;; + error = ENXIO; goto fail; } /* diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index f68d46b2597..31ae9666c44 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.25 2003/01/15 06:31:24 art Exp $ */ +/* $OpenBSD: if_nge.c,v 1.26 2003/08/06 21:08:07 millert Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -806,7 +806,7 @@ nge_attach(parent, self, aux) if (!(command & PCI_COMMAND_IO_ENABLE)) { printf("%s: failed to enable I/O ports!\n", sc->sc_dv.dv_xname); - error = ENXIO;; + error = ENXIO; goto fail; } /* diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c index 9a9dc021fd1..0ec541a233e 100644 --- a/sys/dev/wscons/wsemul_vt100_subr.c +++ b/sys/dev/wscons/wsemul_vt100_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100_subr.c,v 1.9 2003/04/27 11:22:54 ho Exp $ */ +/* $OpenBSD: wsemul_vt100_subr.c,v 1.10 2003/08/06 21:08:07 millert Exp $ */ /* $NetBSD: wsemul_vt100_subr.c,v 1.7 2000/04/28 21:56:16 mycroft Exp $ */ /* @@ -227,11 +227,11 @@ wsemul_vt100_handle_csi(edp, c) case A3('\0', '\0', 'l'): /* RM */ for (n = 0; n < edp->nargs; n++) vt100_ansimode(edp, ARG(n), VTMODE_RESET); - break;; + break; case A3('?', '\0', 'l'): /* DECRM */ for (n = 0; n < edp->nargs; n++) vt100_decmode(edp, ARG(n), VTMODE_RESET); - break;; + break; case A3('\0', '$', 'p'): /* DECRQM request mode ANSI */ vt100_ansimode(edp, ARG(0), VTMODE_REPORT); break; diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 7e1978f8b43..030f5ba1157 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.83 2003/06/10 21:50:26 mickey Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.84 2003/08/06 21:08:07 millert Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1223,7 +1223,7 @@ more: buf[0] = '\0'; if ((error = copyout(buf, rarg, 1)) != 0) goto out; - *oldlenp += 1;; + *oldlenp += 1; rarg += 1; vargv++; diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c index a61b0588643..0615f515a89 100644 --- a/sys/netiso/if_cons.c +++ b/sys/netiso/if_cons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cons.c,v 1.5 2003/06/02 23:28:17 millert Exp $ */ +/* $OpenBSD: if_cons.c,v 1.6 2003/08/06 21:08:07 millert Exp $ */ /* $NetBSD: if_cons.c,v 1.7 1996/02/13 22:09:44 christos Exp $ */ /*- @@ -781,7 +781,7 @@ FACILtoNSAP(addr, buf) register struct sockaddr_iso *addr; { int len_in_nibbles = *++buf & 0x3f; - u_char buf_len = (len_in_nibbles + 1) >> 1;; /* in bytes */ + u_char buf_len = (len_in_nibbles + 1) >> 1; /* in bytes */ #ifdef ARGO_DEBUG if (argo_debug[D_CADDR]) { diff --git a/sys/scsi/ses.c b/sys/scsi/ses.c index f9ff3546714..c60167450e2 100644 --- a/sys/scsi/ses.c +++ b/sys/scsi/ses.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ses.c,v 1.4 2002/03/15 18:19:53 millert Exp $ */ +/* $OpenBSD: ses.c,v 1.5 2003/08/06 21:08:07 millert Exp $ */ /* $NetBSD: ses.c,v 1.3 2000/01/21 21:19:57 mjacob Exp $ */ /* * Copyright (C) 2000 National Aeronautics & Space Administration @@ -1455,7 +1455,7 @@ ses_encode(char *b, int amt, uint8_t *ep, int elt, int elm, SesComStat *sp) */ static int safte_getconfig(ses_softc_t *); -static int safte_rdstat(ses_softc_t *, int);; +static int safte_rdstat(ses_softc_t *, int); static int set_objstat_sel(ses_softc_t *, ses_objstat *, int); static int wrbuf16(ses_softc_t *, uint8_t, uint8_t, uint8_t, uint8_t, int); static void wrslot_stat(ses_softc_t *, int); diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c index 1f650f6a3f1..7c682e25141 100644 --- a/sys/uvm/uvm_mmap.c +++ b/sys/uvm/uvm_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_mmap.c,v 1.49 2003/07/21 22:52:19 tedu Exp $ */ +/* $OpenBSD: uvm_mmap.c,v 1.50 2003/08/06 21:08:07 millert Exp $ */ /* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */ /* @@ -910,7 +910,7 @@ sys_madvise(p, v, retval) } */ *uap = v; vaddr_t addr; vsize_t size, pageoff; - int advice, rv;; + int advice, rv; addr = (vaddr_t)SCARG(uap, addr); size = (vsize_t)SCARG(uap, len); |