diff options
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 12 | ||||
| -rw-r--r-- | sys/dev/ic/ar5210.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar5211.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar5212.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_exec.c | 4 | ||||
| -rw-r--r-- | usr.bin/xlint/lint1/decl.c | 6 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/CHANGES.SSL | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index e8d3024db5a..3e23dde6150 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.17 2005/07/20 21:55:50 miod Exp $ */ +/* $OpenBSD: interrupt.c,v 1.18 2005/08/14 11:02:30 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -562,10 +562,10 @@ intrmask_t generic_iointr(intrmask_t pending, struct trap_frame *cf) { struct intrhand *ih; - intrmask_t catched, vm; + intrmask_t caught, vm; int v; - catched = 0; + caught = 0; set_ipending((pending >> 8) & cpl); pending &= ~(cpl << 8); @@ -579,14 +579,14 @@ generic_iointr(intrmask_t pending, struct trap_frame *cf) while (ih) { ih->frame = cf; if ((*ih->ih_fun)(ih->ih_arg)) { - catched |= vm; + caught |= vm; ih->ih_count.ec_count++; } ih = ih->ih_next; } } } - return catched; + return caught; } #ifndef INLINE_SPLRAISE diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index 1e65422c093..252bd282614 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.12 2005/07/18 02:43:25 fgsch Exp $ */ +/* $OpenBSD: macebus.c,v 1.13 2005/08/14 11:02:32 miod Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -688,7 +688,7 @@ intrmask_t macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) { struct intrhand *ih; - intrmask_t catched, vm; + intrmask_t caught, vm; int v; intrmask_t pending; u_int64_t intstat, isastat, mask; @@ -697,7 +697,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) intstat &= 0xffff; isastat = bus_space_read_8(&macebus_tag, mace_h, MACE_ISA_INT_STAT); - catched = 0; + caught = 0; /* Mask off masked interrupts and save them as pending */ if (intstat & cf->cpl) { @@ -705,7 +705,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) mask = bus_space_read_8(&crimebus_tag, crime_h, CRIME_INT_MASK); mask &= ~ipending; bus_space_write_8(&crimebus_tag, crime_h, CRIME_INT_MASK, mask); - catched++; + caught++; } /* Scan all unmasked. Scan the first 16 for now */ @@ -719,7 +719,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) while (ih) { ih->frame = cf; if ((*ih->ih_fun)(ih->ih_arg)) { - catched |= vm; + caught |= vm; ih->ih_count.ec_count++; } ih = ih->ih_next; @@ -727,7 +727,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) } } - if (catched) + if (caught) return CR_INT_0; return 0; /* Non found here */ diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c index cc134022e08..861ba1e59e6 100644 --- a/sys/dev/ic/ar5210.c +++ b/sys/dev/ic/ar5210.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5210.c,v 1.27 2005/08/02 12:55:11 reyk Exp $ */ +/* $OpenBSD: ar5210.c,v 1.28 2005/08/14 11:02:32 miod Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -2319,7 +2319,7 @@ ar5k_ar5210_get_isr(hal, interrupt_mask) *interrupt_mask |= HAL_INT_FATAL; /* - * Special interrupt handling (not catched by the driver) + * Special interrupt handling (not caught by the driver) */ if (((*interrupt_mask) & AR5K_AR5210_ISR_RXPHY) && hal->ah_radar.r_enabled == AH_TRUE) diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c index 41800bc4bdc..8ff066b1425 100644 --- a/sys/dev/ic/ar5211.c +++ b/sys/dev/ic/ar5211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5211.c,v 1.19 2005/07/30 17:13:17 reyk Exp $ */ +/* $OpenBSD: ar5211.c,v 1.20 2005/08/14 11:02:33 miod Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -2412,7 +2412,7 @@ ar5k_ar5211_get_isr(hal, interrupt_mask) *interrupt_mask |= HAL_INT_FATAL; /* - * Special interrupt handling (not catched by the driver) + * Special interrupt handling (not caught by the driver) */ if (((*interrupt_mask) & AR5K_AR5211_PISR_RXPHY) && hal->ah_radar.r_enabled == AH_TRUE) diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c index 6b47ef2187d..5591bf123a0 100644 --- a/sys/dev/ic/ar5212.c +++ b/sys/dev/ic/ar5212.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5212.c,v 1.23 2005/07/30 17:13:17 reyk Exp $ */ +/* $OpenBSD: ar5212.c,v 1.24 2005/08/14 11:02:33 miod Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -2757,7 +2757,7 @@ ar5k_ar5212_get_isr(hal, interrupt_mask) *interrupt_mask |= HAL_INT_FATAL; /* - * Special interrupt handling (not catched by the driver) + * Special interrupt handling (not caught by the driver) */ if (((*interrupt_mask) & AR5K_AR5212_PISR_RXPHY) && hal->ah_radar.r_enabled == AH_TRUE) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index c5fc952c164..78c5f0451f1 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.94 2005/08/01 07:02:39 art Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.95 2005/08/14 11:02:33 miod Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -455,7 +455,7 @@ sys_execve(p, v, retval) stopprofclock(p); /* stop profiling */ fdcloseexec(p); /* handle close on exec */ - execsigs(p); /* reset catched signals */ + execsigs(p); /* reset caught signals */ /* set command name & other accounting info */ len = min(nid.ni_cnd.cn_namelen, MAXCOMLEN); diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c index c449b8e5789..ad43b68b55d 100644 --- a/usr.bin/xlint/lint1/decl.c +++ b/usr.bin/xlint/lint1/decl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: decl.c,v 1.10 2004/08/03 00:09:54 deraadt Exp $ */ +/* $OpenBSD: decl.c,v 1.11 2005/08/14 11:02:33 miod Exp $ */ /* $NetBSD: decl.c,v 1.11 1995/10/02 17:34:16 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: decl.c,v 1.10 2004/08/03 00:09:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: decl.c,v 1.11 2005/08/14 11:02:33 miod Exp $"; #endif #include <sys/param.h> @@ -1974,7 +1974,7 @@ isredec(dsym, warn) return(0); if (rsym->s_scl == EXTERN && rsym->s_def == DEF) { /* - * All cases except "int a = 1; static int a;" are catched + * All cases except "int a = 1; static int a;" are caught * above with or without a warning */ /* redeclaration of %s */ diff --git a/usr.sbin/httpd/src/CHANGES.SSL b/usr.sbin/httpd/src/CHANGES.SSL index b844dbcd9f1..bffb5f8e6d9 100644 --- a/usr.sbin/httpd/src/CHANGES.SSL +++ b/usr.sbin/httpd/src/CHANGES.SSL @@ -545,7 +545,7 @@ *) Fixed a typo related to a RAND_status call in ssl_engine_rand.c which was introduced in 2.6.1 and which caused mod_ssl fail to - compile if OpenSSL >= 0.9.5 was used [Sorry, my gcc hasn't catched + compile if OpenSSL >= 0.9.5 was used [Sorry, my gcc hasn't caught this typo :-(...] *) Added also some random files which exists under Mach/Rhapshody |