diff options
author | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-02-24 06:19:01 +0000 |
---|---|---|
committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-02-24 06:19:01 +0000 |
commit | 5684b0ff2799cac6658e9e66d3dc150030aaf083 (patch) | |
tree | 4a906e7014b917d765632b751e3f46785aceb0fd | |
parent | 6e513c40818b714c9555797760d6e4c3e4f48d7f (diff) |
Correct the spelling of "transferred" and "transferring"
from Tobias Ulmer (tobiasu at tmux.org); ok jmc@, krw@
-rw-r--r-- | lib/libsndio/sio_sun.c | 4 | ||||
-rw-r--r-- | sys/arch/macppc/dev/tpms.c | 4 | ||||
-rw-r--r-- | sys/arch/vax/dec/sii.c | 6 | ||||
-rw-r--r-- | sys/dev/ata/wdvar.h | 6 | ||||
-rw-r--r-- | sys/dev/ic/aic79xx.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/aic79xx.h | 6 | ||||
-rw-r--r-- | sys/dev/ic/aic79xx_openbsd.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxxvar.h | 6 | ||||
-rw-r--r-- | sys/dev/ic/siop_common.c | 14 | ||||
-rw-r--r-- | sys/dev/ic/xl.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_sk.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/if_atu.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/uvisor.c | 4 | ||||
-rw-r--r-- | sys/netinet/tcp_usrreq.c | 6 | ||||
-rw-r--r-- | usr.bin/oldrdist/main.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/info_hes.c | 6 | ||||
-rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/mod_rewrite.html | 2 | ||||
-rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html | 2 | ||||
-rw-r--r-- | usr.sbin/npppd/common/bytebuf.c | 6 |
19 files changed, 48 insertions, 48 deletions
diff --git a/lib/libsndio/sio_sun.c b/lib/libsndio/sio_sun.c index e02babc2117..cb5a369fc68 100644 --- a/lib/libsndio/sio_sun.c +++ b/lib/libsndio/sio_sun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sio_sun.c,v 1.4 2011/11/15 08:05:22 ratchov Exp $ */ +/* $OpenBSD: sio_sun.c,v 1.5 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -48,7 +48,7 @@ struct sio_sun_hdl { int fd; int filling; unsigned ibpf, obpf; /* bytes per frame */ - unsigned ibytes, obytes; /* bytes the hw transfered */ + unsigned ibytes, obytes; /* bytes the hw transferred */ unsigned ierr, oerr; /* frames the hw dropped */ int offset; /* frames play is ahead of record */ int idelta, odelta; /* position reported to client */ diff --git a/sys/arch/macppc/dev/tpms.c b/sys/arch/macppc/dev/tpms.c index 40567c34d76..ce9e1abe07f 100644 --- a/sys/arch/macppc/dev/tpms.c +++ b/sys/arch/macppc/dev/tpms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tpms.c,v 1.15 2010/04/09 17:01:30 jasper Exp $ */ +/* $OpenBSD: tpms.c,v 1.16 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 2005, Johan Wallén @@ -128,7 +128,7 @@ * Magic numbers. */ -/* The amount of data transfered by the USB device. */ +/* The amount of data transferred by the USB device. */ #define TPMS_DATA_LEN 81 /* The maximum number of sensors. */ diff --git a/sys/arch/vax/dec/sii.c b/sys/arch/vax/dec/sii.c index 75cd717b15c..03e0686f5f8 100644 --- a/sys/arch/vax/dec/sii.c +++ b/sys/arch/vax/dec/sii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sii.c,v 1.13 2011/07/17 22:46:47 matthew Exp $ */ +/* $OpenBSD: sii.c,v 1.14 2012/02/24 06:19:00 guenther Exp $ */ /* $NetBSD: sii.c,v 1.42 2000/06/02 20:20:29 mhitch Exp $ */ /* * Copyright (c) 2008 Miodrag Vallat. @@ -645,7 +645,7 @@ again: printf("%s: Parity error\n", sc->sc_dev.dv_xname); goto abort; } - /* dmalen = amount left to transfer, i = amount transfered */ + /* dmalen = amount left to transfer, i = amount transferred */ i = state->dmalen; state->dmalen = 0; state->dmaCurPhase = -1; @@ -899,7 +899,7 @@ again: #endif } - /* read amount transfered if DMA didn't finish */ + /* read amount transferred if DMA didn't finish */ if (state->dmalen > 0) { i = state->dmalen - regs->dmlotc; state->dmalen = 0; diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h index b89e7b1c3c8..5d51ddcd4d4 100644 --- a/sys/dev/ata/wdvar.h +++ b/sys/dev/ata/wdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdvar.h,v 1.18 2011/09/22 22:12:45 deraadt Exp $ */ +/* $OpenBSD: wdvar.h,v 1.19 2012/02/24 06:19:00 guenther Exp $ */ /* $NetBSD: wdvar.h,v 1.3 1998/11/11 19:38:27 bouyer Exp $ */ /* @@ -44,8 +44,8 @@ struct ata_bio { struct disklabel *lp; /* pointer to drive's label info */ daddr64_t blkno; /* block addr */ daddr64_t blkdone; /* number of blks transferred */ - daddr64_t nblks; /* number of block currently transfering */ - int nbytes; /* number of bytes currently transfering */ + daddr64_t nblks; /* number of block currently transferring */ + int nbytes; /* number of bytes currently transferring */ long bcount; /* total number of bytes */ char *databuf; /* data buffer address */ volatile int error; diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c index 2fc227c23b4..d0aa0b0e21d 100644 --- a/sys/dev/ic/aic79xx.c +++ b/sys/dev/ic/aic79xx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.c,v 1.48 2011/04/19 21:59:51 chl Exp $ */ +/* $OpenBSD: aic79xx.c,v 1.49 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -1225,7 +1225,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat) * that requires host assistance for completion. * While handling the message phase(s), we will be * notified by the sequencer after each byte is - * transfered so we can track bus phase changes. + * transferred so we can track bus phase changes. * * If this is the first time we've seen a HOST_MSG_LOOP * interrupt, initialize the state of the host message diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h index 28e6d6dac60..a3578cd4d1e 100644 --- a/sys/dev/ic/aic79xx.h +++ b/sys/dev/ic/aic79xx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.h,v 1.21 2006/12/21 02:28:47 krw Exp $ */ +/* $OpenBSD: aic79xx.h,v 1.22 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -519,7 +519,7 @@ struct hardware_scb { * o A residual has occurred if SG_FULL_RESID is set in sgptr, * or residual_sgptr does not have SG_LIST_NULL set. * - * o We are transfering the last segment if residual_datacnt has + * o We are transferring the last segment if residual_datacnt has * the SG_LAST_SEG flag set. * * Host: @@ -562,7 +562,7 @@ struct hardware_scb { */ /* - * Definition of a scatter/gather element as transfered to the controller. + * Definition of a scatter/gather element as transferred to the controller. * The aic7xxx chips only support a 24bit length. We use the top byte of * the length to store additional address bits and a flag to indicate * that a given segment terminates the transfer. This gives us an diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index bba6da338e3..8638f0c5c25 100644 --- a/sys/dev/ic/aic79xx_openbsd.c +++ b/sys/dev/ic/aic79xx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.c,v 1.37 2010/06/28 18:31:02 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.38 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -237,7 +237,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) * * Zero any sense not transferred by the * device. The SCSI spec mandates that any - * untransfered data should be assumed to be + * untransferred data should be assumed to be * zero. Complete the 'bounce' of sense information * through buffers accessible via bus-space by * copying it into the clients csio. diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index a1275bc2432..d386a0d9d4e 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxxvar.h,v 1.24 2007/08/04 14:37:34 krw Exp $ */ +/* $OpenBSD: aic7xxxvar.h,v 1.25 2012/02/24 06:19:00 guenther Exp $ */ /* * Core definitions and data structures shareable across OS platforms. * @@ -38,7 +38,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxxvar.h,v 1.24 2007/08/04 14:37:34 krw Exp $ + * $Id: aic7xxxvar.h,v 1.25 2012/02/24 06:19:00 guenther Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ */ @@ -459,7 +459,7 @@ struct hardware_scb { * o A residual has occurred if SG_FULL_RESID is set in sgptr, * or residual_sgptr does not have SG_LIST_NULL set. * - * o We are transfering the last segment if residual_datacnt has + * o We are transferring the last segment if residual_datacnt has * the SG_LAST_SEG flag set. * * Host: diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c index 45a1e904c0d..e6b47b0a4f7 100644 --- a/sys/dev/ic/siop_common.c +++ b/sys/dev/ic/siop_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_common.c,v 1.34 2010/07/23 07:47:13 jsg Exp $ */ +/* $OpenBSD: siop_common.c,v 1.35 2012/02/24 06:19:00 guenther Exp $ */ /* $NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $ */ /* @@ -805,24 +805,24 @@ siop_sdp(siop_cmd, offset) #endif /* * Save data pointer. We do this by adjusting the tables to point - * at the beginning of the data not yet transfered. - * offset points to the first table with untransfered data. + * at the beginning of the data not yet transferred. + * offset points to the first table with untransferred data. */ /* * before doing that we decrease resid from the amount of data which - * has been transfered. + * has been transferred. */ siop_update_resid(siop_cmd, offset); /* * First let see if we have a resid from a phase mismatch. If so, - * we have to adjst the table at offset to remove transfered data. + * we have to adjst the table at offset to remove transferred data. */ if (siop_cmd->flags & CMDFL_RESID) { siop_cmd->flags &= ~CMDFL_RESID; table = &siop_cmd->siop_tables->data[offset]; - /* "cut" already transfered data from this table */ + /* "cut" already transferred data from this table */ table->addr = siop_htoc32(sc, siop_ctoh32(sc, table->addr) + siop_ctoh32(sc, table->count) - siop_cmd->resid); @@ -830,7 +830,7 @@ siop_sdp(siop_cmd, offset) } /* - * now we can remove entries which have been transfered. + * now we can remove entries which have been transferred. * We just move the entries with data left at the beginning of the * tables */ diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index d7879ed8a5f..1ef4ab1b150 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.104 2011/07/14 16:38:27 stsp Exp $ */ +/* $OpenBSD: xl.c,v 1.105 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -77,7 +77,7 @@ */ /* - * The 3c90x series chips use a bus-master DMA interface for transfering + * The 3c90x series chips use a bus-master DMA interface for transferring * packets to and from the controller chip. Some of the "vortex" cards * (3c59x) also supported a bus master mode, however for those chips * you could only DMA packets to/from a contiguous memory buffer. For diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index d5a0df10651..0c357fc8800 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.160 2011/06/22 16:44:27 tedu Exp $ */ +/* $OpenBSD: if_sk.c,v 1.161 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2302,7 +2302,7 @@ sk_init_xmac(struct sk_if_softc *sc_if) * that jumbo frames larger than 8192 bytes will be * truncated. Disabling all bad frame filtering causes * the RX FIFO to operate in streaming mode, in which - * case the XMAC will start transfering frames out of the + * case the XMAC will start transferring frames out of the * RX FIFO as soon as the FIFO threshold is reached. */ SK_XM_SETBIT_4(sc_if, XM_MODE, XM_MODE_RX_BADFRAMES| diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 5f1659bae15..adf88148695 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.100 2011/09/18 23:24:12 krw Exp $ */ +/* $OpenBSD: if_atu.c,v 1.101 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -339,7 +339,7 @@ atu_usb_request(struct atu_softc *sc, u_int8_t type, #ifdef ATU_DEBUG if (atudebug) { if (type & UT_READ) { - DPRINTFN(20, ("%s: transfered 0x%x bytes in\n", + DPRINTFN(20, ("%s: transferred 0x%x bytes in\n", sc->atu_dev.dv_xname, total_len)); DPRINTFN(20, ("%s: dump [%10D]\n", sc->atu_dev.dv_xname, data, " ")); diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index dfa2645339e..ba57360c583 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvisor.c,v 1.44 2011/07/03 15:47:18 matthew Exp $ */ +/* $OpenBSD: uvisor.c,v 1.45 2012/02/24 06:19:00 guenther Exp $ */ /* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */ /* @@ -66,7 +66,7 @@ int uvisordebug = 0; /* From the Linux driver */ /* * UVISOR_REQUEST_BYTES_AVAILABLE asks the visor for the number of bytes that - * are available to be transfered to the host for the specified endpoint. + * are available to be transferred to the host for the specified endpoint. * Currently this is not used, and always returns 0x0001 */ #define UVISOR_REQUEST_BYTES_AVAILABLE 0x01 diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 78320828840..d2780b1e8e1 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.109 2012/01/03 21:50:12 bluhm Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.110 2012/02/24 06:19:00 guenther Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -997,9 +997,9 @@ tcp_update_sndspace(struct tcpcb *tp) } /* - * Scale the recv buffer by looking at how much data was transfered in + * Scale the recv buffer by looking at how much data was transferred in * on approximated RTT. If more then a big part of the recv buffer was - * transfered during that time we increase the buffer by a constant. + * transferred during that time we increase the buffer by a constant. * In low memory situation try to shrink the buffer to the initial size. */ void diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c index be3b2bb5fe5..3b1a0a972c3 100644 --- a/usr.bin/oldrdist/main.c +++ b/usr.bin/oldrdist/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.21 2009/10/27 23:59:41 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.22 2012/02/24 06:19:00 guenther Exp $ */ /* * Copyright (c) 1983, 1993 @@ -48,7 +48,7 @@ int debug; /* debugging flag */ int nflag; /* NOP flag, just print commands without executing */ int qflag; /* Quiet. Don't print messages */ int options; /* global options */ -int iamremote; /* act as remote server for transfering files */ +int iamremote; /* act as remote server for transferring files */ FILE *fin = NULL; /* input file pointer */ int rem = -1; /* file descriptor to remote source/sink process */ diff --git a/usr.sbin/amd/amd/info_hes.c b/usr.sbin/amd/amd/info_hes.c index a9b0c0805cf..5561614866a 100644 --- a/usr.sbin/amd/amd/info_hes.c +++ b/usr.sbin/amd/amd/info_hes.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)info_hes.c 8.1 (Berkeley) 6/6/93 - * $Id: info_hes.c,v 1.12 2003/06/02 23:36:51 millert Exp $ + * $Id: info_hes.c,v 1.13 2012/02/24 06:19:00 guenther Exp $ */ /* @@ -308,8 +308,8 @@ hs_res_send(char *buf, int buflen, char *answer, int anslen) } } if (status == -2) { - /* There was a permanent error transfering this - zone. Give up. */ + /* There was a permanent error transferring + * this zone. Give up. */ if (s != -1) { (void) close(s); s = -1; diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_rewrite.html b/usr.sbin/httpd/htdocs/manual/mod/mod_rewrite.html index 61903c9d942..3ec00917564 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_rewrite.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_rewrite.html @@ -326,7 +326,7 @@ <code>%N</code> (see below). These are available for creating the strings <em>Substitution</em> and <em>TestString</em>. Figure 2 shows to which locations the back-references are - transfered for expansion. + transferred for expansion. <div align="CENTER"> <table cellspacing="0" cellpadding="2" border="0"> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html b/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html index 26b8e0e4494..8343c41d0c5 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html @@ -1247,7 +1247,7 @@ Why has my webserver a higher load now that I run SSL there? <p> Because SSL uses strong cryptographic encryption and this needs a lot of number crunching. And because when you request a webpage via HTTPS even - the images are transfered encrypted. So, when you have a lot of HTTPS + the images are transferred encrypted. So, when you have a lot of HTTPS traffic the load increases. <p> <li><a name="ToC43"></a> diff --git a/usr.sbin/npppd/common/bytebuf.c b/usr.sbin/npppd/common/bytebuf.c index ed1bceb5e02..872c0f8fe40 100644 --- a/usr.sbin/npppd/common/bytebuf.c +++ b/usr.sbin/npppd/common/bytebuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bytebuf.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */ +/* $OpenBSD: bytebuf.c,v 1.4 2012/02/24 06:19:00 guenther Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. * All rights reserved. @@ -41,7 +41,7 @@ * }</pre> * * @author Yasuoka Masahiko - * $Id: bytebuf.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ + * $Id: bytebuf.c,v 1.4 2012/02/24 06:19:00 guenther Exp $ */ #include <stdlib.h> #include <string.h> @@ -268,7 +268,7 @@ bytebuffer_put(bytebuffer *_this, const void *src, size_t srclen) * and <code>errno</code> is <code>ENOBUFS</code> * * @param dst pointer of the destination memory. Specify NULL - * to skip transfering the data. + * to skip transferring the data. * @param dstlne memory size of the destination. */ void * |