Remove some double semicolons (hmm, do two semis equal a maxi?).

I've skipped the GNU stuff for now.  From Patrick Latifi.

50 files changed, 97 insertions, 97 deletions

diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 2b86dbc6215..ab95cd29fed 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utils.c,v 1.23 2003/07/29 00:24:14 deraadt Exp $	*/
+/*	$OpenBSD: utils.c,v 1.24 2003/08/06 21:08:05 millert Exp $	*/
 /*	$NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #else
-static char rcsid[] = "$OpenBSD: utils.c,v 1.23 2003/07/29 00:24:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: utils.c,v 1.24 2003/08/06 21:08:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -105,7 +105,7 @@ copy_file(FTSENT *entp, int dne)
 	if (to_fd == -1) {
 		warn("%s", to.p_path);
 		(void)close(from_fd);
-		return (1);;
+		return (1);
 	}
 
 	rval = 0;
diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c
index 11f065797f9..53e72b5ab25 100644
--- a/bin/ksh/lex.c
+++ b/bin/ksh/lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.c,v 1.17 2003/02/28 09:45:09 jmc Exp $	*/
+/*	$OpenBSD: lex.c,v 1.18 2003/08/06 21:08:05 millert Exp $	*/
 
 /*
  * lexical analysis and source input
@@ -1394,5 +1394,5 @@ pop_state_(si, old_end)
 
 	afree(old_base, ATEMP);
 
-	return si->base + STATE_BSIZE - 1;;
+	return si->base + STATE_BSIZE - 1;
 }
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index 688c5820eed..832ad7ffbc7 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.17 2003/08/05 20:52:27 millert Exp $	*/
+/*	$OpenBSD: misc.c,v 1.18 2003/08/06 21:08:05 millert Exp $	*/
 
 /*
  * Miscellaneous functions
@@ -1049,13 +1049,13 @@ ksh_getopt(argv, go, options)
 				go->optarg = argv[go->optind - 1] + go->p;
 				go->p = 0;
 			} else
-				go->optarg = (char *) 0;;
+				go->optarg = (char *) 0;
 		} else {
 			if (argv[go->optind] && digit(argv[go->optind][0])) {
 				go->optarg = argv[go->optind++];
 				go->p = 0;
 			} else
-				go->optarg = (char *) 0;;
+				go->optarg = (char *) 0;
 		}
 	}
 	return c;
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 113e928efcd..1464a9e4151 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file_subs.c,v 1.23 2003/06/02 23:32:08 millert Exp $	*/
+/*	$OpenBSD: file_subs.c,v 1.24 2003/08/06 21:08:05 millert Exp $	*/
 /*	$NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.23 2003/06/02 23:32:08 millert Exp $";
+static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.24 2003/08/06 21:08:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -287,7 +287,7 @@ mk_link(char *to, struct stat *to_sb, char *from, int ign)
 		 */
 		if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) {
 			paxwarn(1, "Unable to link file %s to itself", to);
-			return(-1);;
+			return(-1);
 		}
 
 		/*
diff --git a/games/phantasia/misc.c b/games/phantasia/misc.c
index f578438e5d2..57b4163903a 100644
--- a/games/phantasia/misc.c
+++ b/games/phantasia/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.12 2003/04/25 21:37:47 deraadt Exp $	*/
+/*	$OpenBSD: misc.c,v 1.13 2003/08/06 21:08:05 millert Exp $	*/
 /*	$NetBSD: misc.c,v 1.2 1995/03/24 03:59:03 cgd Exp $	*/
 
 /*
@@ -1200,7 +1200,7 @@ adjuststats()
 
 	/* calculate effective quickness */
 	dtemp = ((Player.p_gold + Player.p_gems / 2.0) - 1000.0) / Statptr->c_goldtote
-	    - Player.p_level;;
+	    - Player.p_level;
 	dtemp = MAX(0.0, dtemp);/* gold slows player down */
 	Player.p_speed = Player.p_quickness + Player.p_quksilver - dtemp;
 
diff --git a/games/rogue/level.c b/games/rogue/level.c
index 91a0449d8d1..b13a3cdbb8b 100644
--- a/games/rogue/level.c
+++ b/games/rogue/level.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: level.c,v 1.5 2003/06/03 03:01:41 millert Exp $	*/
+/*	$OpenBSD: level.c,v 1.6 2003/08/06 21:08:05 millert Exp $	*/
 /*	$NetBSD: level.c,v 1.3 1995/04/22 10:27:37 cgd Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)level.c	8.1 (Berkeley) 5/31/93";
 #else
-static const char rcsid[] = "$OpenBSD: level.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
+static const char rcsid[] = "$OpenBSD: level.c,v 1.6 2003/08/06 21:08:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -255,7 +255,7 @@ make_room(rn, r1, r2, r3)
 	case BIG_ROOM:
 		top_row = get_rand(MIN_ROW, MIN_ROW+5);
 		bottom_row = get_rand(DROWS-7, DROWS-2);
-		left_col = get_rand(0, 10);;
+		left_col = get_rand(0, 10);
 		right_col = get_rand(DCOLS-11, DCOLS-1);
 		rn = 0;
 		goto B;
diff --git a/kerberosV/src/lib/krb5/transited.c b/kerberosV/src/lib/krb5/transited.c
index 6d754f16566..8a7873df261 100644
--- a/kerberosV/src/lib/krb5/transited.c
+++ b/kerberosV/src/lib/krb5/transited.c
@@ -93,7 +93,7 @@ make_path(krb5_context context, struct tr_realm *r,
 	    if(path->realm == NULL){
 		r->next = path; /* XXX */
 		krb5_set_error_string (context, "malloc: out of memory");
-		return ENOMEM;;
+		return ENOMEM;
 	    }
 	}
     }else if(strncmp(from, to, strlen(to)) == 0){
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index be9e1dfeec8..fa30fba831e 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_bigkey.c,v 1.12 2003/06/02 20:18:33 millert Exp $	*/
+/*	$OpenBSD: hash_bigkey.c,v 1.13 2003/08/06 21:08:05 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -36,7 +36,7 @@
 #if 0
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #else
-static const char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.12 2003/06/02 20:18:33 millert Exp $";
+static const char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.13 2003/08/06 21:08:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -608,7 +608,7 @@ __big_split(hashp, op, np, big_keyp, addr, obucket, ret)
 	if ((ret->next_addr = __find_last_page(hashp, &big_keyp))) {
 		if (!(ret->nextp =
 		    __get_buf(hashp, ret->next_addr, big_keyp, 0)))
-			return (-1);;
+			return (-1);
 	} else
 		ret->nextp = NULL;
 
diff --git a/lib/libcrypto/asn1/a_bytes.c b/lib/libcrypto/asn1/a_bytes.c
index afd27b80e1b..2407f7c87a2 100644
--- a/lib/libcrypto/asn1/a_bytes.c
+++ b/lib/libcrypto/asn1/a_bytes.c
@@ -78,7 +78,7 @@ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp,
 
 	if (tag >= 32)
 		{
-		i=ASN1_R_TAG_VALUE_TOO_HIGH;;
+		i=ASN1_R_TAG_VALUE_TOO_HIGH;
 		goto err;
 		}
 	if (!(ASN1_tag2bit(tag) & type))
diff --git a/lib/libcrypto/asn1/t_x509.c b/lib/libcrypto/asn1/t_x509.c
index d1034c47f83..30f68561b75 100644
--- a/lib/libcrypto/asn1/t_x509.c
+++ b/lib/libcrypto/asn1/t_x509.c
@@ -321,7 +321,7 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
 int ASN1_STRING_print(BIO *bp, ASN1_STRING *v)
 	{
 	int i,n;
-	char buf[80],*p;;
+	char buf[80],*p;
 
 	if (v == NULL) return(0);
 	n=0;
diff --git a/lib/libcrypto/x509v3/v3_utl.c b/lib/libcrypto/x509v3/v3_utl.c
index 34ac2998def..466c91d0e8d 100644
--- a/lib/libcrypto/x509v3/v3_utl.c
+++ b/lib/libcrypto/x509v3/v3_utl.c
@@ -78,7 +78,7 @@ int X509V3_add_value(const char *name, const char *value,
 	CONF_VALUE *vtmp = NULL;
 	char *tname = NULL, *tvalue = NULL;
 	if(name && !(tname = BUF_strdup(name))) goto err;
-	if(value && !(tvalue = BUF_strdup(value))) goto err;;
+	if(value && !(tvalue = BUF_strdup(value))) goto err;
 	if(!(vtmp = (CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE)))) goto err;
 	if(!*extlist && !(*extlist = sk_CONF_VALUE_new_null())) goto err;
 	vtmp->section = NULL;
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 48cccc0f35b..d4f185a1217 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc.c,v 1.17 2003/06/02 20:18:41 millert Exp $	*/
+/*	$OpenBSD: kvm_proc.c,v 1.18 2003/08/06 21:08:05 millert Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.17 2003/06/02 20:18:41 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.18 2003/08/06 21:08:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -554,7 +554,7 @@ kvm_argv(kd, p, addr, narg, maxcnt)
 		cp = kd->argbuf + addr;
 		cc = kd->nbpg - addr;
 		if (maxcnt > 0 && cc > maxcnt - len)
-			cc = maxcnt - len;;
+			cc = maxcnt - len;
 		ep = memchr(cp, '\0', cc);
 		if (ep != 0)
 			cc = ep - cp + 1;
diff --git a/lib/libpthread/uthread/uthread_fork.c b/lib/libpthread/uthread/uthread_fork.c
index 0271e822526..02f7656859b 100644
--- a/lib/libpthread/uthread/uthread_fork.c
+++ b/lib/libpthread/uthread/uthread_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_fork.c,v 1.10 2001/08/21 19:24:53 fgsch Exp $	*/
+/*	$OpenBSD: uthread_fork.c,v 1.11 2003/08/06 21:08:05 millert Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -167,10 +167,10 @@ fork(void)
 					_thread_fd_table[i]->w_owner = NULL;
 					_thread_fd_table[i]->r_fname = NULL;
 					_thread_fd_table[i]->w_fname = NULL;
-					_thread_fd_table[i]->r_lineno = 0;;
-					_thread_fd_table[i]->w_lineno = 0;;
-					_thread_fd_table[i]->r_lockcount = 0;;
-					_thread_fd_table[i]->w_lockcount = 0;;
+					_thread_fd_table[i]->r_lineno = 0;
+					_thread_fd_table[i]->w_lineno = 0;
+					_thread_fd_table[i]->r_lockcount = 0;
+					_thread_fd_table[i]->w_lockcount = 0;
 
 					/* Initialise the read/write queues: */
 					TAILQ_INIT(&_thread_fd_table[i]->r_queue);
diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c
index d32bb1cb9cc..b35d1b0107d 100644
--- a/lib/libssl/s3_clnt.c
+++ b/lib/libssl/s3_clnt.c
@@ -168,7 +168,7 @@ int ssl3_connect(SSL *s)
 	long num1;
 	void (*cb)(const SSL *ssl,int type,int val)=NULL;
 	int ret= -1;
-	int new_state,state,skip=0;;
+	int new_state,state,skip=0;
 
 	RAND_add(&Time,sizeof(Time),0);
 	ERR_clear_error();
diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c
index 6c6d3f0d260..f979dfe85fd 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/lib/libssl/src/apps/ca.c
@@ -2173,7 +2173,7 @@ again2:
 			p="Valid";
 		else
 			p="\ninvalid type, Data base error\n";
-		BIO_printf(bio_err,"Type	  :%s\n",p);;
+		BIO_printf(bio_err,"Type	  :%s\n",p);
 		if (rrow[DB_type][0] == 'R')
 			{
 			p=rrow[DB_exp_date]; if (p == NULL) p="undef";
diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c
index 2e73f34676f..efa4902abd5 100644
--- a/lib/libssl/src/apps/s_client.c
+++ b/lib/libssl/src/apps/s_client.c
@@ -785,7 +785,7 @@ re_start:
 				/* goto end; */
 				}
 
-			sbuf_len-=i;;
+			sbuf_len-=i;
 			sbuf_off+=i;
 			if (sbuf_len <= 0)
 				{
diff --git a/lib/libssl/src/crypto/asn1/a_bytes.c b/lib/libssl/src/crypto/asn1/a_bytes.c
index afd27b80e1b..2407f7c87a2 100644
--- a/lib/libssl/src/crypto/asn1/a_bytes.c
+++ b/lib/libssl/src/crypto/asn1/a_bytes.c
@@ -78,7 +78,7 @@ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp,
 
 	if (tag >= 32)
 		{
-		i=ASN1_R_TAG_VALUE_TOO_HIGH;;
+		i=ASN1_R_TAG_VALUE_TOO_HIGH;
 		goto err;
 		}
 	if (!(ASN1_tag2bit(tag) & type))
diff --git a/lib/libssl/src/crypto/asn1/t_x509.c b/lib/libssl/src/crypto/asn1/t_x509.c
index d1034c47f83..30f68561b75 100644
--- a/lib/libssl/src/crypto/asn1/t_x509.c
+++ b/lib/libssl/src/crypto/asn1/t_x509.c
@@ -321,7 +321,7 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
 int ASN1_STRING_print(BIO *bp, ASN1_STRING *v)
 	{
 	int i,n;
-	char buf[80],*p;;
+	char buf[80],*p;
 
 	if (v == NULL) return(0);
 	n=0;
diff --git a/lib/libssl/src/crypto/x509v3/v3_utl.c b/lib/libssl/src/crypto/x509v3/v3_utl.c
index 34ac2998def..466c91d0e8d 100644
--- a/lib/libssl/src/crypto/x509v3/v3_utl.c
+++ b/lib/libssl/src/crypto/x509v3/v3_utl.c
@@ -78,7 +78,7 @@ int X509V3_add_value(const char *name, const char *value,
 	CONF_VALUE *vtmp = NULL;
 	char *tname = NULL, *tvalue = NULL;
 	if(name && !(tname = BUF_strdup(name))) goto err;
-	if(value && !(tvalue = BUF_strdup(value))) goto err;;
+	if(value && !(tvalue = BUF_strdup(value))) goto err;
 	if(!(vtmp = (CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE)))) goto err;
 	if(!*extlist && !(*extlist = sk_CONF_VALUE_new_null())) goto err;
 	vtmp->section = NULL;
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c
index d32bb1cb9cc..b35d1b0107d 100644
--- a/lib/libssl/src/ssl/s3_clnt.c
+++ b/lib/libssl/src/ssl/s3_clnt.c
@@ -168,7 +168,7 @@ int ssl3_connect(SSL *s)
 	long num1;
 	void (*cb)(const SSL *ssl,int type,int val)=NULL;
 	int ret= -1;
-	int new_state,state,skip=0;;
+	int new_state,state,skip=0;
 
 	RAND_add(&Time,sizeof(Time),0);
 	ERR_clear_error();
diff --git a/sbin/isakmpd/crypto.c b/sbin/isakmpd/crypto.c
index d3492f060cf..a7b3690b480 100644
--- a/sbin/isakmpd/crypto.c
+++ b/sbin/isakmpd/crypto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto.c,v 1.14 2003/06/03 14:28:16 ho Exp $	*/
+/*	$OpenBSD: crypto.c,v 1.15 2003/08/06 21:08:06 millert Exp $	*/
 /*	$EOM: crypto.c,v 1.32 2000/03/07 20:08:51 niklas Exp $	*/
 
 /*
@@ -347,7 +347,7 @@ crypto_decrypt (struct keystate *ks, u_int8_t *buf, u_int16_t len)
    * like this.
    */
   memcpy (ks->liv, buf + len - ks->xf->blocksize, ks->xf->blocksize);
-  ks->xf->decrypt (ks, buf, len);;
+  ks->xf->decrypt (ks, buf, len);
   LOG_DBG_BUF ((LOG_CRYPTO, 30, "crypto_decrypt: after decryption", buf,
 		len));
 }
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);
diff --git a/usr.bin/awk/run.c b/usr.bin/awk/run.c
index b36e7d01c9c..c3d5922bf5c 100644
--- a/usr.bin/awk/run.c
+++ b/usr.bin/awk/run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: run.c,v 1.22 2003/07/02 21:04:09 deraadt Exp $	*/
+/*	$OpenBSD: run.c,v 1.23 2003/08/06 21:08:07 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -1786,7 +1786,7 @@ Cell *sub(Node **a, int nnn)	/* substitute command */
 		if (pb > buf + bufsz)
 			FATAL("sub result2 %.30s too big; can't happen", buf);
 		setsval(x, buf);	/* BUG: should be able to avoid copy */
-		result = True;;
+		result = True;
 	}
 	tempfree(x);
 	tempfree(y);
diff --git a/usr.bin/less/ch.c b/usr.bin/less/ch.c
index ca54da967cf..0966dca9872 100644
--- a/usr.bin/less/ch.c
+++ b/usr.bin/less/ch.c
@@ -683,7 +683,7 @@ ch_delbufs()
 	while (ch_bufhead != END_OF_CHAIN)
 	{
 		bp = ch_bufhead;
-		bp->next->prev = bp->prev;;
+		bp->next->prev = bp->prev;
 		bp->prev->next = bp->next;
 		free(bp);
 	}
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 04a343c1aaa..592e365a006 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_svcout.c,v 1.19 2003/07/09 03:35:21 deraadt Exp $	*/
+/*	$OpenBSD: rpc_svcout.c,v 1.20 2003/08/06 21:08:07 millert Exp $	*/
 /*	$NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -842,7 +842,7 @@ write_rpc_svc_fg(infile, sp)
 	else {
 		fprintf(fout, "%si = open(\"/dev/tty\", 2);\n", sp);
 		fprintf(fout, "%sif (i >= 0) {\n", sp);
-		fprintf(fout, "%s\t(void) ioctl(i, TIOCNOTTY, (char *)NULL);\n", sp);;
+		fprintf(fout, "%s\t(void) ioctl(i, TIOCNOTTY, (char *)NULL);\n", sp);
 		fprintf(fout, "%s\t(void) close(i);\n", sp);
 		fprintf(fout, "%s}\n", sp);
 	}
diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c
index e2f28521a63..ead2d875036 100644
--- a/usr.bin/xlint/lint1/mem1.c
+++ b/usr.bin/xlint/lint1/mem1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem1.c,v 1.4 2002/02/16 21:27:59 millert Exp $	*/
+/*	$OpenBSD: mem1.c,v 1.5 2003/08/06 21:08:08 millert Exp $	*/
 /*	$NetBSD: mem1.c,v 1.2 1995/07/03 21:24:25 cgd Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: mem1.c,v 1.4 2002/02/16 21:27:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: mem1.c,v 1.5 2003/08/06 21:08:08 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -216,7 +216,7 @@ xgetblk(mbp, s)
 			frmblks = mb->nxt;
 		}
 		mb->ffree = mb->blk;
-		mb->nfree = mb->size;;
+		mb->nfree = mb->size;
 		mb->nxt = *mbp;
 		*mbp = mb;
 	}
diff --git a/usr.sbin/afs/src/lib/cmd/cmd.c b/usr.sbin/afs/src/lib/cmd/cmd.c
index deb82eb674c..d6891bad548 100644
--- a/usr.sbin/afs/src/lib/cmd/cmd.c
+++ b/usr.sbin/afs/src/lib/cmd/cmd.c
@@ -319,7 +319,7 @@ cmd_AddParm (struct cmd_syndesc *ts, const char *name,
 	     cmd_parmdesc_type type, cmd_parmdesc_flags flags,
 	     const char *help_str)
 {
-    struct cmd_parmdesc *p = &ts->parms[ts->nParams];;
+    struct cmd_parmdesc *p = &ts->parms[ts->nParams];
 
     memset (p, 0, sizeof(*p));
 
diff --git a/usr.sbin/afs/src/lwp/preempt.c b/usr.sbin/afs/src/lwp/preempt.c
index e618c88092d..cc11fda9536 100644
--- a/usr.sbin/afs/src/lwp/preempt.c
+++ b/usr.sbin/afs/src/lwp/preempt.c
@@ -134,7 +134,7 @@ PRE_EndPreempt(void)
         (sigaction(SIGALRM, &sa, (struct sigaction *)0) == -1))
         return(LWP_ESYSTEM);
 #else
-    vec.sv_handler = SIG_DFL;;
+    vec.sv_handler = SIG_DFL;
     vec.sv_mask = vec.sv_onstack = 0;
 
     if ((setitimer(ITIMER_REAL, &itv, (struct itimerval *) 0) == -1) ||
diff --git a/usr.sbin/httpd/src/main/buff.c b/usr.sbin/httpd/src/main/buff.c
index f24f1631591..faee2f956f6 100644
--- a/usr.sbin/httpd/src/main/buff.c
+++ b/usr.sbin/httpd/src/main/buff.c
@@ -505,7 +505,7 @@ API_EXPORT(void) ap_bpushh(BUFF *fb, HANDLE hFH)
 API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval)
 {
     if (optname == BO_BYTECT) {
-	fb->bytes_sent = *(const long int *) optval - (long int) fb->outcnt;;
+	fb->bytes_sent = *(const long int *) optval - (long int) fb->outcnt;
 	return 0;
     }
     else {
diff --git a/usr.sbin/httpd/src/modules/example/mod_example.c b/usr.sbin/httpd/src/modules/example/mod_example.c
index cc40eabe15e..9f10286b92d 100644
--- a/usr.sbin/httpd/src/modules/example/mod_example.c
+++ b/usr.sbin/httpd/src/modules/example/mod_example.c
@@ -548,7 +548,7 @@ static int example_handler(request_rec *r)
 	    ap_get_server_version());
     ap_rputs("  <BR>\n", r);
     ap_rprintf(r, "  Server built: \"%s\"\n", ap_get_server_built());
-    ap_rputs("  </P>\n", r);;
+    ap_rputs("  </P>\n", r);
     ap_rputs("  <P>\n", r);
     ap_rputs("  The format for the callback trace is:\n", r);
     ap_rputs("  </P>\n", r);
diff --git a/usr.sbin/httpd/src/modules/standard/mod_autoindex.c b/usr.sbin/httpd/src/modules/standard/mod_autoindex.c
index 34ba9a978d9..985d5b377d7 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_autoindex.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_autoindex.c
@@ -679,7 +679,7 @@ static void *merge_autoindex_configs(pool *p, void *basev, void *addv)
 	     * There are local non-incremental settings, which clear
 	     * all inheritance from above.  They *are* the new base settings.
 	     */
-	    new->opts = add->opts;;
+	    new->opts = add->opts;
 	}
 	/*
 	 * We're guaranteed that there'll be no overlap between
diff --git a/usr.sbin/ppp/ppp/alias_db.c b/usr.sbin/ppp/ppp/alias_db.c
index 8a62092e474..32f142273df 100644
--- a/usr.sbin/ppp/ppp/alias_db.c
+++ b/usr.sbin/ppp/ppp/alias_db.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: alias_db.c,v 1.21 2002/06/15 08:01:59 brian Exp $
+ * $OpenBSD: alias_db.c,v 1.22 2003/08/06 21:08:08 millert Exp $
  */
 
 /*
@@ -2226,7 +2226,7 @@ void
 SetProtocolFlags(struct alias_link *link, int pflags)
 {
 
-    link->pflags = pflags;;
+    link->pflags = pflags;
 }
 
 int
diff --git a/usr.sbin/ppp/ppp/radius.c b/usr.sbin/ppp/ppp/radius.c
index 8dfbfb08960..31bf41ebb63 100644
--- a/usr.sbin/ppp/ppp/radius.c
+++ b/usr.sbin/ppp/ppp/radius.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: radius.c,v 1.23 2002/07/04 23:35:08 brian Exp $
+ *	$OpenBSD: radius.c,v 1.24 2003/08/06 21:08:08 millert Exp $
  *
  */
 
@@ -635,7 +635,7 @@ radius_Init(struct radius *r)
   r->mppe.recvkeylen = 0;
   r->mppe.sendkey = NULL;
   r->mppe.sendkeylen = 0;
-  *r->cfg.file = '\0';;
+  *r->cfg.file = '\0';
   log_Printf(LogDEBUG, "Radius: radius_Init\n");
 }