diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-08-06 21:08:09 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-08-06 21:08:09 +0000 |
commit | 8f4be4c9fc053e06d8170659c9bde356ada1a655 (patch) | |
tree | d116498a9604b21bf16d82850fcf1726939a4f6a /lib | |
parent | 9293e104f0b834487ffef8344f12e9dc93c0abd0 (diff) |
Remove some double semicolons (hmm, do two semis equal a maxi?).
I've skipped the GNU stuff for now. From Patrick Latifi.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/db/hash/hash_bigkey.c | 6 | ||||
-rw-r--r-- | lib/libkvm/kvm_proc.c | 6 | ||||
-rw-r--r-- | lib/libpthread/uthread/uthread_fork.c | 10 | ||||
-rw-r--r-- | lib/libssl/src/apps/ca.c | 2 | ||||
-rw-r--r-- | lib/libssl/src/apps/s_client.c | 2 | ||||
-rw-r--r-- | lib/libssl/src/crypto/asn1/a_bytes.c | 2 | ||||
-rw-r--r-- | lib/libssl/src/crypto/asn1/t_x509.c | 2 | ||||
-rw-r--r-- | lib/libssl/src/crypto/x509v3/v3_utl.c | 2 | ||||
-rw-r--r-- | lib/libssl/src/ssl/s3_clnt.c | 2 |
9 files changed, 17 insertions, 17 deletions
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/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/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(); |