summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2007-04-16 12:31:35 +0000
committerpjd <pjd@FreeBSD.org>2007-04-16 12:31:35 +0000
commit2ee778fb9976f8c230d74358aa4c81a1769d4a9a (patch)
tree8d76b4be51d7d010d6a51ec9364a6c4d506242f0
parent33ebe8ecb609a792fa92c763393b2c654252e6ca (diff)
downloadFreeBSD-src-2ee778fb9976f8c230d74358aa4c81a1769d4a9a.zip
FreeBSD-src-2ee778fb9976f8c230d74358aa4c81a1769d4a9a.tar.gz
s/destory/destroy/ (except for the code in contrib/).
-rw-r--r--sys/dev/ex/if_exvar.h2
-rw-r--r--sys/dev/firewire/fwdma.c2
-rw-r--r--sys/netnatm/natm.h2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.32
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index 5e2f001..9df9886 100644
--- a/sys/dev/ex/if_exvar.h
+++ b/sys/dev/ex/if_exvar.h
@@ -113,6 +113,6 @@ void ex_stop(struct ex_softc *);
#define EX_LOCK_INIT(_sc) \
mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \
MTX_NETWORK_LOCK, MTX_DEF)
-#define EX_LOCK_DESTORY(_sc) mtx_destroy(&_sc->sc_mtx);
+#define EX_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx);
#define EX_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED);
#define EX_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index c64dbe6..2c84ebc 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -104,7 +104,7 @@ fwdma_malloc(struct firewire_comm *fc, int alignment, bus_size_t size,
flag, &dma->dma_map);
if (err) {
printf("fwdma_malloc: failed(2)\n");
- /* XXX destory tag */
+ /* XXX destroy tag */
return(NULL);
}
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 8a3fdc1..5603b9e 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -74,7 +74,7 @@ struct natmpcb {
#define NPCB_FREE 0x01 /* free (not on any list) */
#define NPCB_CONNECTED 0x02 /* connected */
#define NPCB_IP 0x04 /* used by IP */
-#define NPCB_DRAIN 0x08 /* destory as soon as inq == 0 */
+#define NPCB_DRAIN 0x08 /* destroy as soon as inq == 0 */
/* flag arg to npcb_free */
#define NPCB_REMOVE 0 /* remove from global list */
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
index 204912a..c433dfa 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
@@ -63,7 +63,7 @@ index.
will attempt to create a bridge interface with the name given by the table
index and set the status of the interface to "active/up".
.It Va destroy
-will attempt to destory the bridge interface.
+will attempt to destroy the bridge interface.
.El
.It Va begemotBridgeBaseSpanEnabled
A SNMP SET operation on this object is only successfull if the corresponding
OpenPOWER on IntegriCloud