summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsobrado <sobrado@openbsd.org>2011-07-07 14:25:15 +0000
committersobrado <sobrado@openbsd.org>2011-07-07 14:25:15 +0000
commit0742bdbf96724d457342fce13b2eaa26c775e6e9 (patch)
treeeab275ac94de1e35ca8945a84db1d0187ee68300
parentspell leo sowerby's name correctly; from Jeff Ross (diff)
downloadwireguard-openbsd-0742bdbf96724d457342fce13b2eaa26c775e6e9.tar.xz
wireguard-openbsd-0742bdbf96724d457342fce13b2eaa26c775e6e9.zip
fix typos; while here, improve spacing in comments.
changes to libevent and zlib headers sent to the upstream maintainers. ok jmc@ (for typos), millert@
-rw-r--r--include/langinfo.h6
-rw-r--r--include/netdb.h4
-rw-r--r--lib/libevent/event.h6
-rw-r--r--lib/libz/zlib.h6
-rw-r--r--sys/isofs/udf/ecma167-udf.h18
-rw-r--r--sys/uvm/uvm_object.h8
6 files changed, 24 insertions, 24 deletions
diff --git a/include/langinfo.h b/include/langinfo.h
index 22edfa8c3bc..d20814770d0 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: langinfo.h,v 1.5 2005/11/16 16:48:14 espie Exp $ */
+/* $OpenBSD: langinfo.h,v 1.6 2011/07/07 14:25:15 sobrado Exp $ */
/* $NetBSD: langinfo.h,v 1.3 1995/04/28 23:30:54 jtc Exp $ */
/*
@@ -63,8 +63,8 @@
#define RADIXCHAR 44 /* Radix character */
#define THOUSEP 45 /* Separator for thousands */
-#define YESSTR 46 /* Affirmitive response for yes/no queries */
-#define YESEXPR 47 /* Affirmitive response for yes/no queries */
+#define YESSTR 46 /* Affirmative response for yes/no queries */
+#define YESEXPR 47 /* Affirmative response for yes/no queries */
#define NOSTR 48 /* Negative response for yes/no queries */
#define NOEXPR 49 /* Negative response for yes/no queries */
#define CRNCYSTR 50 /* Currency symbol */
diff --git a/include/netdb.h b/include/netdb.h
index 8083b8899c6..da75d7ce843 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netdb.h,v 1.28 2011/04/05 00:46:06 matthew Exp $ */
+/* $OpenBSD: netdb.h,v 1.29 2011/07/07 14:25:15 sobrado Exp $ */
/*
* ++Copyright++ 1980, 1983, 1988, 1993
@@ -144,7 +144,7 @@ struct protoent {
#define NETDB_INTERNAL -1 /* see errno */
#define NETDB_SUCCESS 0 /* no problem */
#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */
-#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */
+#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */
#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
#define NO_DATA 4 /* Valid name, no data record of requested type */
#define NO_ADDRESS NO_DATA /* no address */
diff --git a/lib/libevent/event.h b/lib/libevent/event.h
index da92822aa28..275da704360 100644
--- a/lib/libevent/event.h
+++ b/lib/libevent/event.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: event.h,v 1.23 2010/05/31 20:56:42 nicm Exp $ */
+/* $OpenBSD: event.h,v 1.24 2011/07/07 14:25:15 sobrado Exp $ */
/*
* Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
@@ -50,7 +50,7 @@
to redesign the applications. As a result, Libevent allows for portable
application development and provides the most scalable event notification
mechanism available on an operating system. Libevent can also be used for
- multi-threaded aplications; see Steven Grimm's explanation. Libevent should
+ multi-threaded applications; see Steven Grimm's explanation. Libevent should
compile on Linux, *BSD, Mac OS X, Solaris and Windows.
@section usage Standard usage
@@ -185,7 +185,7 @@ extern "C" {
#define EV_READ 0x02
#define EV_WRITE 0x04
#define EV_SIGNAL 0x08
-#define EV_PERSIST 0x10 /* Persistant event */
+#define EV_PERSIST 0x10 /* Persistent event */
struct event_base;
#ifndef EVENT_NO_STRUCT
diff --git a/lib/libz/zlib.h b/lib/libz/zlib.h
index baa3d076b51..bf4ee35dedc 100644
--- a/lib/libz/zlib.h
+++ b/lib/libz/zlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: zlib.h,v 1.9 2005/07/20 15:56:41 millert Exp $ */
+/* $OpenBSD: zlib.h,v 1.10 2011/07/07 14:25:15 sobrado Exp $ */
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.3, July 18th, 2005
@@ -271,7 +271,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
output buffer because there might be more output pending.
Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
- decide how much data to accumualte before producing output, in order to
+ decide how much data to accumulate before producing output, in order to
maximize compression.
If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
@@ -870,7 +870,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
See inflateBack() for the usage of these routines.
inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+ the parameters are invalid, Z_MEM_ERROR if the internal state could not
be allocated, or Z_VERSION_ERROR if the version of the library does not
match the version of the header file.
*/
diff --git a/sys/isofs/udf/ecma167-udf.h b/sys/isofs/udf/ecma167-udf.h
index c2054caa49c..4210d49dfa3 100644
--- a/sys/isofs/udf/ecma167-udf.h
+++ b/sys/isofs/udf/ecma167-udf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecma167-udf.h,v 1.8 2009/12/23 02:24:39 krw Exp $ */
+/* $OpenBSD: ecma167-udf.h,v 1.9 2011/07/07 14:25:15 sobrado Exp $ */
/* $NetBSD: ecma167-udf.h,v 1.10 2008/06/24 15:30:33 reinoud Exp $ */
/*-
@@ -29,9 +29,9 @@
*
*
* Extended and adapted for UDFv2.50+ bij Reinoud Zandijk based on the
- * origional by Scott Long.
+ * original by Scott Long.
*
- * 20030508 Made some small typo and explainatory comments
+ * 20030508 Made some small typo and explanatory comments
* 20030510 Added UDF 2.01 structures
* 20030519 Added/correct comments on multi-partitioned logical volume space
* 20050616 Added pseudo overwrite
@@ -103,11 +103,11 @@ enum {
enum {
UDF_ACCESSTYPE_NOT_SPECIFIED = 0, /* unknown */
- UDF_ACCESSTYPE_PSEUDO_OVERWITE = 0, /* Pseudo overwritable, f.e. BD-R's LOW */
+ UDF_ACCESSTYPE_PSEUDO_OVERWITE = 0, /* pseudo overwritable, e.g. BD-R's LOW */
UDF_ACCESSTYPE_READ_ONLY = 1, /* really only readable */
UDF_ACCESSTYPE_WRITE_ONCE = 2, /* write once and you're done */
UDF_ACCESSTYPE_REWRITEABLE = 3, /* may need extra work to rewrite */
- UDF_ACCESSTYPE_OVERWRITABLE = 4 /* no limits on rewriting; harddisc f.e.*/
+ UDF_ACCESSTYPE_OVERWRITABLE = 4 /* no limits on rewriting; e.g. harddisc*/
};
@@ -307,7 +307,7 @@ struct vol_desc_ptr {
struct pri_vol_desc {
struct desc_tag tag;
uint32_t seq_num; /* MAX prevail */
- uint32_t pvd_num; /* assigned by author; 0 is special as in it may only occure once */
+ uint32_t pvd_num; /* assigned by author; 0 is special as in it may only occur once */
char vol_id[32]; /* KEY ; main identifier of this disc */
uint16_t vds_num; /* volume descriptor number; i.e. what volume number is it */
uint16_t max_vol_seq; /* maximum volume descriptor number known */
@@ -325,7 +325,7 @@ struct pri_vol_desc {
struct regid imp_id;
uint8_t imp_use[64];
uint32_t prev_vds_loc; /* location of predecessor _lov ? */
- uint16_t flags; /* bit 0 : if set indicates volume set name is meaningfull */
+ uint16_t flags; /* bit 0 : if set indicates volume set name is meaningful */
uint8_t reserved[22];
} __packed;
@@ -444,7 +444,7 @@ struct part_map_meta {
uint32_t meta_mirror_file_lbn;
uint32_t meta_bitmap_file_lbn;
uint32_t alloc_unit_size; /* allocation unit size in blocks */
- uint16_t alignment_unit_size; /* alignment nessisary in blocks */
+ uint16_t alignment_unit_size; /* alignment necessary in blocks */
uint8_t flags;
uint8_t reserved1[5];
} __packed;
@@ -680,7 +680,7 @@ struct filetimes_extattr_entry {
struct extattr_entry hdr;
uint32_t d_l; /* length of times[] data following */
uint32_t existence; /* bitmask */
- struct timestamp times[1]; /* in order of assending bits */
+ struct timestamp times[1]; /* in order of ascending bits */
} __packed;
#define UDF_FILETIMES_ATTR_NO 5
#define UDF_FILETIMES_FILE_CREATION 1
diff --git a/sys/uvm/uvm_object.h b/sys/uvm/uvm_object.h
index 1ece82c1368..65ae4445f81 100644
--- a/sys/uvm/uvm_object.h
+++ b/sys/uvm/uvm_object.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_object.h,v 1.17 2010/04/30 21:56:39 oga Exp $ */
+/* $OpenBSD: uvm_object.h,v 1.18 2011/07/07 14:25:15 sobrado Exp $ */
/* $NetBSD: uvm_object.h,v 1.11 2001/03/09 01:02:12 chs Exp $ */
/*
@@ -60,10 +60,10 @@ struct uvm_object {
* memory objects don't have reference counts -- they never die).
*
* this value is used to detected kernel object mappings at uvm_unmap()
- * time. normally when an object is unmapped its pages eventaully become
- * deactivated and then paged out and/or freed. this is not useful
+ * time. normally when an object is unmapped its pages eventually become
+ * deactivated and then paged out and/or freed. this is not useful
* for kernel objects... when a kernel object is unmapped we always want
- * to free the resources associated with the mapping. UVM_OBJ_KERN
+ * to free the resources associated with the mapping. UVM_OBJ_KERN
* allows us to decide which type of unmapping we want to do.
*
* in addition, we have kernel objects which may be used in an