Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Dec 2012 17:27:49 -0800 (PST)
From:      Jeremy Chadwick <jdc@koitsu.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   misc/174625: Numerous typo fixes in comments/strings
Message-ID:  <20121222012749.CF47E73A31@icarus.home.lan>
Resent-Message-ID: <201212220130.qBM1U0p0089761@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         174625
>Category:       misc
>Synopsis:       Numerous typo fixes in comments/strings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 22 01:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD icarus.home.lan 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r244089: Mon Dec 10 08:20:27 PST 2012 root@icarus.home.lan:/usr/obj/usr/src/sys/X7SBA_RELENG_9_amd64 amd64
>Description:
	Fix numerous typos/spelling mistakes in kernel/userland src
	bits:

	oustanding  (should be outstanding)
	connecter   (should be connector, sans French spelling)
	conected    (should be connected)
	conecting   (should be connecting)
	disconect   (should be disconnect)
	diconnect   (should be disconnect)
	syncronous  (should be synchronous)
	asyncronous (should be asynchronous)

	These are only changed for comments or printf()-like strings;
	no functions are renamed, etc...

	Some of these may need to be submit upstream to official sources
	(ex. tcsh, ZFS, WPA, PCI Vendors List, OpenSM), so if the commiter
	wants to exclude those, I understand.
>How-To-Repeat:
>Fix:
	Below diff is against base/stable/9 r244573; manually backporting
	these to CURRENT/HEAD may be needed.

	Patch will be available at the below URL once I get a PR number:

	http://jdc.koitsu.org/freebsd/{prnum}


Index: contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c
===================================================================
--- contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c	(revision 244573)
+++ contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c	(working copy)
@@ -2731,7 +2731,7 @@ __osm_ftree_rank_leaf_switches(IN ftree_fabric_t *
 		case IB_NODE_TYPE_CA:
 			/* HCA connected directly to another HCA - not FatTree */
 			OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_ERROR, "ERR AB0F: "
-				"CA conected directly to another CA: "
+				"CA connected directly to another CA: "
 				"0x%016" PRIx64 " <---> 0x%016" PRIx64 "\n",
 				__osm_ftree_hca_get_guid_ho(p_hca),
 				cl_ntoh64(osm_node_get_node_guid
@@ -2841,7 +2841,7 @@ __osm_ftree_fabric_construct_hca_ports(IN ftree_fa
 		case IB_NODE_TYPE_CA:
 			/* HCA connected directly to another HCA - not FatTree */
 			OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_ERROR, "ERR AB11: "
-				"CA conected directly to another CA: "
+				"CA connected directly to another CA: "
 				"0x%016" PRIx64 " <---> 0x%016" PRIx64 "\n",
 				cl_ntoh64(osm_node_get_node_guid(p_node)),
 				cl_ntoh64(remote_node_guid));
Index: contrib/tcsh/nls/C/set2
===================================================================
--- contrib/tcsh/nls/C/set2	(revision 244573)
+++ contrib/tcsh/nls/C/set2	(working copy)
@@ -76,7 +76,7 @@ $set 2
 73 Third Last Realtime Signal
 74 Second Last Realtime Signal
 75 Last Realtime Signal
-76 LAN Asyncronous I/O
+76 LAN Asynchronous I/O
 77 PTY read/write availability
 78 I/O intervention required
 79 HFT monitor mode granted
Index: contrib/tcsh/nls/german/set2
===================================================================
--- contrib/tcsh/nls/german/set2	(revision 244573)
+++ contrib/tcsh/nls/german/set2	(working copy)
@@ -76,7 +76,7 @@ $set 2
 73 Third Last Realtime Signal
 74 Second Last Realtime Signal
 75 Last Realtime Signal
-76 LAN Asyncronous I/O
+76 LAN Asynchronous I/O
 77 PTY read/write availability
 78 I/O intervention required
 79 HFT monitor mode granted
Index: contrib/tcsh/nls/russian/set2
===================================================================
--- contrib/tcsh/nls/russian/set2	(revision 244573)
+++ contrib/tcsh/nls/russian/set2	(working copy)
@@ -76,7 +76,7 @@ $set 2
 73 Third Last Realtime Signal
 74 Second Last Realtime Signal
 75 Last Realtime Signal
-76 LAN Asyncronous I/O
+76 LAN Asynchronous I/O
 77 PTY read/write availability
 78 I/O intervention required
 79 HFT monitor mode granted
Index: contrib/tcsh/nls/ukrainian/set2
===================================================================
--- contrib/tcsh/nls/ukrainian/set2	(revision 244573)
+++ contrib/tcsh/nls/ukrainian/set2	(working copy)
@@ -76,7 +76,7 @@ $set 2
 73 Third Last Realtime Signal
 74 Second Last Realtime Signal
 75 Last Realtime Signal
-76 LAN Asyncronous I/O
+76 LAN Asynchronous I/O
 77 PTY read/write availability
 78 I/O intervention required
 79 HFT monitor mode granted
Index: contrib/tcsh/sh.init.c
===================================================================
--- contrib/tcsh/sh.init.c	(revision 244573)
+++ contrib/tcsh/sh.init.c	(working copy)
@@ -808,7 +808,7 @@ mesginit(void)
     /* aiws */
     if (mesg[SIGAIO].pname == NULL) {
 	mesg[SIGAIO].iname = "AIO";
-	mesg[SIGAIO].pname = CSAVS(2, 76, "LAN Asyncronous I/O");
+	mesg[SIGAIO].pname = CSAVS(2, 76, "LAN Asynchronous I/O");
     }
 #endif /* SIGAIO */
 
Index: contrib/wpa/src/wps/wps_upnp.c
===================================================================
--- contrib/wpa/src/wps/wps_upnp.c	(revision 244573)
+++ contrib/wpa/src/wps/wps_upnp.c	(working copy)
@@ -33,8 +33,8 @@
  * While uncommon, if we have to do it then it will stall the entire
  * hostapd program, which is bad.
  * This is because we use the standard linux getaddrinfo() function
- * which is syncronous.
- * An asyncronous solution would be to use the free "ares" library.
+ * which is synchronous.
+ * An asynchronous solution would be to use the free "ares" library.
  * -- Does not have a robust output buffering scheme.  Uses a single
  * fixed size output buffer per TCP/HTTP connection, with possible (although
  * unlikely) possibility of overflow and likely excessive use of RAM.
Index: share/examples/ppi/ppilcd.c
===================================================================
--- share/examples/ppi/ppilcd.c	(revision 244573)
+++ share/examples/ppi/ppilcd.c	(working copy)
@@ -269,7 +269,7 @@ do_char(struct lcd_driver *driver, char ch)
  * one of the ground pins (eg. pin 25).
  *
  * Note that the pinning on some LCD modules has the odd and even pins
- * arranged as though reversed; check carefully before conecting a module
+ * arranged as though reversed; check carefully before connecting a module
  * as it is possible to toast the HD44780 if the power is reversed.
  */
 
Index: share/misc/pci_vendors
===================================================================
--- share/misc/pci_vendors	(revision 244573)
+++ share/misc/pci_vendors	(working copy)
@@ -10902,7 +10902,7 @@
 	0040  QSC-200/300
 	0050  ESC-100D
 	0060  ESC-100M
-	00f0  MPAC-100 Syncronous Serial Card (Zilog 85230)
+	00f0  MPAC-100 Synchronous Serial Card (Zilog 85230)
 	0170  QSCLP-100
 	0180  DSCLP-100
 	0190  SSCLP-100
Index: sys/cam/ctl/scsi_ctl.c
===================================================================
--- sys/cam/ctl/scsi_ctl.c	(revision 244573)
+++ sys/cam/ctl/scsi_ctl.c	(working copy)
@@ -2070,7 +2070,7 @@ ctlfe_dump_queue(struct ctlfe_lun_softc *softc)
 
 	xpt_print(periph->path, "%d requests total waiting for CCBs\n",
 		  num_items);
-	xpt_print(periph->path, "%ju CCBs oustanding (%ju allocated, %ju "
+	xpt_print(periph->path, "%ju CCBs outstanding (%ju allocated, %ju "
 		  "freed)\n", (uintmax_t)(softc->ccbs_alloced -
 		  softc->ccbs_freed), (uintmax_t)softc->ccbs_alloced,
 		  (uintmax_t)softc->ccbs_freed);
Index: sys/cam/scsi/scsi_da.c
===================================================================
--- sys/cam/scsi/scsi_da.c	(revision 244573)
+++ sys/cam/scsi/scsi_da.c	(working copy)
@@ -1915,7 +1915,7 @@ dastart(struct cam_periph *periph, union ccb *star
 
 out:
 		/*
-		 * Block out any asyncronous callbacks
+		 * Block out any asynchronous callbacks
 		 * while we touch the pending ccb list.
 		 */
 		LIST_INSERT_HEAD(&softc->pending_ccbs,
@@ -2166,7 +2166,7 @@ dadone(struct cam_periph *periph, union ccb *done_
 		}
 
 		/*
-		 * Block out any asyncronous callbacks
+		 * Block out any asynchronous callbacks
 		 * while we touch the pending ccb list.
 		 */
 		LIST_REMOVE(&done_ccb->ccb_h, periph_links.le);
@@ -2175,7 +2175,7 @@ dadone(struct cam_periph *periph, union ccb *done_
 			softc->flags |= DA_FLAG_WENT_IDLE;
 
 		if ((softc->flags & DA_FLAG_PACK_INVALID) != 0) {
-			xpt_print(periph->path, "oustanding %d\n",
+			xpt_print(periph->path, "outstanding %d\n",
 				  softc->outstanding_cmds);
 		}
 
Index: sys/cam/scsi/scsi_pt.c
===================================================================
--- sys/cam/scsi/scsi_pt.c	(revision 244573)
+++ sys/cam/scsi/scsi_pt.c	(working copy)
@@ -460,7 +460,7 @@ ptstart(struct cam_periph *periph, union ccb *star
 		start_ccb->ccb_h.ccb_state = PT_CCB_BUFFER_IO_UA;
 
 		/*
-		 * Block out any asyncronous callbacks
+		 * Block out any asynchronous callbacks
 		 * while we touch the pending ccb list.
 		 */
 		LIST_INSERT_HEAD(&softc->pending_ccbs, &start_ccb->ccb_h,
@@ -554,7 +554,7 @@ ptdone(struct cam_periph *periph, union ccb *done_
 		}
 
 		/*
-		 * Block out any asyncronous callbacks
+		 * Block out any asynchronous callbacks
 		 * while we touch the pending ccb list.
 		 */
 		LIST_REMOVE(&done_ccb->ccb_h, periph_links.le);
Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	(revision 244573)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	(working copy)
@@ -934,7 +934,7 @@ dnode_special_close(dnode_handle_t *dnh)
 
 	/*
 	 * Wait for final references to the dnode to clear.  This can
-	 * only happen if the arc is asyncronously evicting state that
+	 * only happen if the arc is asynchronously evicting state that
 	 * has a hold on this dnode while we are trying to evict this
 	 * dnode.
 	 */
Index: sys/contrib/octeon-sdk/cvmx-dpi-defs.h
===================================================================
--- sys/contrib/octeon-sdk/cvmx-dpi-defs.h	(revision 244573)
+++ sys/contrib/octeon-sdk/cvmx-dpi-defs.h	(working copy)
@@ -1176,7 +1176,7 @@ union cvmx_dpi_sli_prtx_cfg
                                                            The memory region must be memory like. */
 	uint64_t reserved_14_15               : 2;
 	uint64_t molr                         : 6;  /**< Max Outstanding Load Requests
-                                                         Limits the number of oustanding load requests on
+                                                         Limits the number of outstanding load requests on
                                                          the port by restricting the number of tags
                                                          used by the SLI to track load responses.  This
                                                          value can range from 1 to 32. Setting a value of
Index: sys/contrib/octeon-sdk/cvmx-mixx-defs.h
===================================================================
--- sys/contrib/octeon-sdk/cvmx-mixx-defs.h	(revision 244573)
+++ sys/contrib/octeon-sdk/cvmx-mixx-defs.h	(working copy)
@@ -341,7 +341,7 @@ union cvmx_mixx_ctl
                                                          TimeStamp Interrupt is issued (see MIX_INTR[TS]
                                                          MIX_INTENA[TSENA]).
                                                          SWNOTE: For o63, since the implementation only supports
-                                                         4 oustanding timestamp interrupts, this field should
+                                                         4 outstanding timestamp interrupts, this field should
                                                          only be programmed from [0..3]. */
 	uint64_t crc_strip                    : 1;  /**< HW CRC Strip Enable
                                                          When enabled, the last 4 bytes(CRC) of the ingress packet
Index: sys/dev/aic7xxx/aic7xxx.h
===================================================================
--- sys/dev/aic7xxx/aic7xxx.h	(revision 244573)
+++ sys/dev/aic7xxx/aic7xxx.h	(working copy)
@@ -768,7 +768,7 @@ struct ahc_syncrate {
 #define	AHC_ULTRA2_XFER_PERIOD 0x0a
 
 /*
- * Indexes into our table of syncronous transfer rates.
+ * Indexes into our table of synchronous transfer rates.
  */
 #define AHC_SYNCRATE_DT		0
 #define AHC_SYNCRATE_ULTRA2	1
Index: sys/dev/cp/if_cp.c
===================================================================
--- sys/dev/cp/if_cp.c	(revision 244573)
+++ sys/dev/cp/if_cp.c	(working copy)
@@ -1,7 +1,7 @@
 /*-
  * Cronyx-Tau-PCI adapter driver for FreeBSD.
  * Supports PPP/HDLC, Cisco/HDLC and FrameRelay protocol in synchronous mode,
- * and asyncronous channels with full modem control.
+ * and asynchronous channels with full modem control.
  * Keepalive protocol implemented in both Cisco and PPP modes.
  *
  * Copyright (C) 1999-2004 Cronyx Engineering.
Index: sys/dev/ctau/if_ct.c
===================================================================
--- sys/dev/ctau/if_ct.c	(revision 244573)
+++ sys/dev/ctau/if_ct.c	(working copy)
@@ -1,7 +1,7 @@
 /*-
  * Cronyx-Tau adapter driver for FreeBSD.
  * Supports PPP/HDLC and Cisco/HDLC protocol in synchronous mode,
- * and asyncronous channels with full modem control.
+ * and asynchronous channels with full modem control.
  * Keepalive protocol implemented in both Cisco and PPP modes.
  *
  * Copyright (C) 1994-2002 Cronyx Engineering.
Index: sys/dev/cx/csigma.c
===================================================================
--- sys/dev/cx/csigma.c	(revision 244573)
+++ sys/dev/cx/csigma.c	(working copy)
@@ -1168,7 +1168,7 @@ void cx_set_dtr (cx_chan_t *c, int on)
 
 	switch (c->num) {
 	default:
-		/* Channels 4..7 and 12..15 in syncronous mode
+		/* Channels 4..7 and 12..15 in synchronous mode
 		 * have no DTR signal. */
 		break;
 
Index: sys/dev/cx/if_cx.c
===================================================================
--- sys/dev/cx/if_cx.c	(revision 244573)
+++ sys/dev/cx/if_cx.c	(working copy)
@@ -1,7 +1,7 @@
 /*-
  * Cronyx-Sigma adapter driver for FreeBSD.
  * Supports PPP/HDLC and Cisco/HDLC protocol in synchronous mode,
- * and asyncronous channels with full modem control.
+ * and asynchronous channels with full modem control.
  * Keepalive protocol implemented in both Cisco and PPP modes.
  *
  * Copyright (C) 1994-2002 Cronyx Engineering.
Index: sys/dev/hptmv/entry.c
===================================================================
--- sys/dev/hptmv/entry.c	(revision 244573)
+++ sys/dev/hptmv/entry.c	(working copy)
@@ -915,7 +915,7 @@ hptmv_event_notify(MV_SATA_ADAPTER *pMvSataAdapter
 				{
 
 					MV_ERROR("RR18xx: illigal value for param1(%d) at "
-							 "connect/disconect event, host=%d\n", param1,
+							 "connect/disconnect event, host=%d\n", param1,
 							 pMvSataAdapter->adapterId );
 
 				}
Index: sys/dev/isci/scil/scif_sas_domain.c
===================================================================
--- sys/dev/isci/scil/scif_sas_domain.c	(revision 244573)
+++ sys/dev/isci/scil/scif_sas_domain.c	(working copy)
@@ -637,7 +637,7 @@ void scif_sas_domain_terminate_requests(
       SCIF_SAS_REQUEST_T      * request = NULL;
 
       // Cycle through the fast list of IO requests.  Terminate each
-      // oustanding requests that matches the criteria supplied by the
+      // outstanding requests that matches the criteria supplied by the
       // caller.
       while (element != NULL)
       {
@@ -1275,7 +1275,7 @@ U8 scif_sas_domain_get_smp_request_count(
    SCIC_TRANSPORT_PROTOCOL   protocol;
 
    // Cycle through the fast list of IO requests.  Terminate each
-   // oustanding requests that matches the criteria supplied by the
+   // outstanding requests that matches the criteria supplied by the
    // caller.
    while (element != NULL)
    {
Index: sys/dev/nsp/nsp.c
===================================================================
--- sys/dev/nsp/nsp.c	(revision 244573)
+++ sys/dev/nsp/nsp.c	(working copy)
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
  ***************************************************/
 /* DEVICE CONFIGURATION FLAGS (MINOR)
  *
- * 0x01   DISCONECT OFF
+ * 0x01   DISCONNECT OFF
  * 0x02   PARITY LINE OFF
  * 0x04   IDENTIFY MSG OFF ( = single lun)
  * 0x08   SYNC TRANSFER OFF
Index: sys/dev/sfxge/common/efx_mcdi.c
===================================================================
--- sys/dev/sfxge/common/efx_mcdi.c	(revision 244573)
+++ sys/dev/sfxge/common/efx_mcdi.c	(working copy)
@@ -86,7 +86,7 @@ efx_mcdi_request_start(
 	/*
 	 * efx_mcdi_request_start() is naturally serialised against both
 	 * efx_mcdi_request_poll() and efx_mcdi_ev_cpl()/efx_mcdi_ev_death(),
-	 * by virtue of there only being one oustanding MCDI request.
+	 * by virtue of there only being one outstanding MCDI request.
 	 * Unfortunately, upper layers may also call efx_mcdi_request_abort()
 	 * at any time, to timeout a pending mcdi request, That request may
 	 * then subsequently complete, meaning efx_mcdi_ev_cpl() or
@@ -439,7 +439,7 @@ efx_mcdi_ev_death(
 	 * The MCDI request (if there is one) has been terminated, either
 	 * by a BADASSERT or REBOOT event.
 	 *
-	 * If there is an oustanding event-completed MCDI operation, then we
+	 * If there is an outstanding event-completed MCDI operation, then we
 	 * will never receive the completion event (because both MCDI
 	 * completions and BADASSERT events are sent to the same evq). So
 	 * complete this MCDI op.
Index: sys/dev/sn/if_sn.c
===================================================================
--- sys/dev/sn/if_sn.c	(revision 244573)
+++ sys/dev/sn/if_sn.c	(working copy)
@@ -444,7 +444,7 @@ startagain:
 	/*
 	 * Wait a short amount of time to see if the allocation request
 	 * completes.  Otherwise, I enable the interrupt and wait for
-	 * completion asyncronously.
+	 * completion asynchronously.
 	 */
 
 	time_out = MEMORY_WAIT_TIME;
Index: sys/dev/stg/tmc18c30.c
===================================================================
--- sys/dev/stg/tmc18c30.c	(revision 244573)
+++ sys/dev/stg/tmc18c30.c	(working copy)
@@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$");
  ***************************************************/
 /* DEVICE CONFIGURATION FLAGS (MINOR)
  *
- * 0x01   DISCONECT OFF
+ * 0x01   DISCONNECT OFF
  * 0x02   PARITY LINE OFF
  * 0x04   IDENTIFY MSG OFF ( = single lun)
  * 0x08   SYNC TRANSFER OFF
Index: sys/kern/uipc_usrreq.c
===================================================================
--- sys/kern/uipc_usrreq.c	(revision 244573)
+++ sys/kern/uipc_usrreq.c	(working copy)
@@ -1341,7 +1341,7 @@ unp_connect(struct socket *so, struct sockaddr *na
 		}
 
 		/*
-		 * The connecter's (client's) credentials are copied from its
+		 * The connector's (client's) credentials are copied from its
 		 * process structure at the time of connect() (which is now).
 		 */
 		cru2x(td->td_ucred, &unp3->unp_peercred);
Index: sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
===================================================================
--- sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c	(revision 244573)
+++ sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c	(working copy)
@@ -306,7 +306,7 @@ ng_l2cap_con_fail(ng_l2cap_con_p con, u_int16_t re
 
 	/*
 	 * There still might be channels (in OPEN state?) that
-	 * did not submit any commands, so diconnect them
+	 * did not submit any commands, so disconnect them
 	 */
 
 	LIST_FOREACH(ch, &l2cap->chan_list, next)
Index: sys/ofed/drivers/net/mlx4/eq.c
===================================================================
--- sys/ofed/drivers/net/mlx4/eq.c	(revision 244573)
+++ sys/ofed/drivers/net/mlx4/eq.c	(working copy)
@@ -705,7 +705,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
 		/* Temporary use polling for command completions */
 		mlx4_cmd_use_polling(dev);
 
-		/* Map the new eq to handle all asyncronous events */
+		/* Map the new eq to handle all asynchronous events */
 		err = mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 0,
 				  priv->eq_table.eq[i].eqn);
 		if (err) {
Index: usr.sbin/bluetooth/hccontrol/link_control.c
===================================================================
--- usr.sbin/bluetooth/hccontrol/link_control.c	(revision 244573)
+++ usr.sbin/bluetooth/hccontrol/link_control.c	(working copy)
@@ -357,7 +357,7 @@ again:
 		goto again;
 
 	return (OK);
-} /* hci_diconnect */
+} /* hci_disconnect */
 
 /* Send Add_SCO_Connection command to the unit */
 static int
Index: usr.sbin/dumpcis/printcis.c
===================================================================
--- usr.sbin/dumpcis/printcis.c	(revision 244573)
+++ usr.sbin/dumpcis/printcis.c	(working copy)
@@ -969,7 +969,7 @@ dump_network_ext(u_char *p, int len)
 			printf(" %02x", p[i + 2]);
 		putchar('\n');
 		break;
-	case 5:			/* Connecter type */
+	case 5:			/* Connector type */
 		if (len < 2)
 			goto err;
 		printf("\tNetwork connector: %s connector standard\n",
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121222012749.CF47E73A31>