summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-11-20 05:12:40 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-11-20 05:12:40 +0000
commitf7aa910a77485f8f205e16933b94680427285272 (patch)
treee304e024e86cd89583e5722bc0aab0b7129979a6
parente01c5ca1dcefd9433af746faa62e7ef1ed4a25b8 (diff)
clean up cases of ;;
-rw-r--r--sys/dev/ata/atascsi.c4
-rw-r--r--sys/dev/ic/isp.c8
-rw-r--r--usr.bin/aucat/midi.c4
-rw-r--r--usr.bin/aucat/wav.c4
-rw-r--r--usr.bin/ssh/auth2-pubkey.c4
-rw-r--r--usr.sbin/ypldap/yp.c4
6 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index a4e60466714..46a7aae003e 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atascsi.c,v 1.97 2010/10/12 00:53:32 krw Exp $ */
+/* $OpenBSD: atascsi.c,v 1.98 2010/11/20 05:12:39 deraadt Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -783,7 +783,7 @@ atascsi_disk_write_same_16(struct scsi_xfer *xs)
}
xa->data = xs->data;
- xa->datalen = xs->datalen;;
+ xa->datalen = xs->datalen;
xa->flags = ATA_F_WRITE;
if (xs->flags & SCSI_POLL)
xa->flags |= ATA_F_POLL;
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 7881c2b53e7..0c2f9209cb7 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp.c,v 1.49 2010/02/20 12:39:41 sobrado Exp $ */
+/* $OpenBSD: isp.c,v 1.50 2010/11/20 05:12:38 deraadt Exp $ */
/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.150 2008/12/15 21:42:38 marius Exp $*/
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
@@ -6162,8 +6162,8 @@ isp_mbox_continue(struct ispsoftc *isp)
ptr = isp->isp_mbxworkp;
switch (isp->isp_lastmbxcmd) {
case MBOX_WRITE_RAM_WORD:
- mbs.param[1] = isp->isp_mbxwrk1++;;
- mbs.param[2] = *ptr++;;
+ mbs.param[1] = isp->isp_mbxwrk1++;
+ mbs.param[2] = *ptr++;
break;
case MBOX_READ_RAM_WORD:
*ptr++ = isp->isp_mboxtmp[2];
@@ -6173,7 +6173,7 @@ isp_mbox_continue(struct ispsoftc *isp)
offset = isp->isp_mbxwrk1;
offset |= isp->isp_mbxwrk8 << 16;
- mbs.param[2] = *ptr++;;
+ mbs.param[2] = *ptr++;
mbs.param[1] = offset;
mbs.param[8] = offset >> 16;
isp->isp_mbxwrk1 = ++offset;
diff --git a/usr.bin/aucat/midi.c b/usr.bin/aucat/midi.c
index b252cb65bb0..88cd253de7e 100644
--- a/usr.bin/aucat/midi.c
+++ b/usr.bin/aucat/midi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: midi.c,v 1.31 2010/11/14 13:51:27 ratchov Exp $ */
+/* $OpenBSD: midi.c,v 1.32 2010/11/20 05:12:38 deraadt Exp $ */
/*
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
*
@@ -475,7 +475,7 @@ ctl_qfr(struct aproc *p)
p->u.ctl.fr -= p->u.ctl.fps;
p->u.ctl.sec++;
if (p->u.ctl.sec < 60)
- break;;
+ break;
p->u.ctl.sec = 0;
p->u.ctl.min++;
if (p->u.ctl.min < 60)
diff --git a/usr.bin/aucat/wav.c b/usr.bin/aucat/wav.c
index 4ab6ba9a428..ea035f16149 100644
--- a/usr.bin/aucat/wav.c
+++ b/usr.bin/aucat/wav.c
@@ -873,7 +873,7 @@ rwav_new(struct file *f)
p = aproc_new(&rwav_ops, f->name);
p->u.io.file = f;
- p->u.io.partial = 0;;
+ p->u.io.partial = 0;
f->rproc = p;
return p;
}
@@ -925,7 +925,7 @@ wwav_new(struct file *f)
p = aproc_new(&wwav_ops, f->name);
p->u.io.file = f;
- p->u.io.partial = 0;;
+ p->u.io.partial = 0;
f->wproc = p;
return p;
}
diff --git a/usr.bin/ssh/auth2-pubkey.c b/usr.bin/ssh/auth2-pubkey.c
index 4e08064e155..0eda7ade9ab 100644
--- a/usr.bin/ssh/auth2-pubkey.c
+++ b/usr.bin/ssh/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.26 2010/06/29 23:16:46 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.27 2010/11/20 05:12:38 deraadt Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -231,7 +231,7 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert)
if ((ep = strrchr(cp, ' ')) != NULL ||
(ep = strrchr(cp, '\t')) != NULL) {
for (; *ep == ' ' || *ep == '\t'; ep++)
- ;;
+ ;
line_opts = cp;
cp = ep;
}
diff --git a/usr.sbin/ypldap/yp.c b/usr.sbin/ypldap/yp.c
index 20f68b475f2..4e8b677f344 100644
--- a/usr.sbin/ypldap/yp.c
+++ b/usr.sbin/ypldap/yp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yp.c,v 1.6 2010/08/03 08:24:23 pyr Exp $ */
+/* $OpenBSD: yp.c,v 1.7 2010/11/20 05:12:38 deraadt Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
*
@@ -225,7 +225,7 @@ yp_dispatch(struct svc_req *req, SVCXPRT *trans)
if (yp_check(req) == -1)
return;
cb = (void *)ypproc_all_2_svc;
- break;;
+ break;
case YPPROC_MASTER:
log_debug("ypproc_master");
if (yp_check(req) == -1)