This patch fixes a bunch of spelling mistakes in comments throughout the

PostgreSQL source code.

Neil Conway

14 files changed, 31 insertions, 31 deletions

diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c
index abf04dfa28a..5f673837258 100644
--- a/contrib/dbase/dbf2pg.c
+++ b/contrib/dbase/dbf2pg.c
@@ -199,7 +199,7 @@ usage(void)
 }
 
 /* patch submitted by Jeffrey Y. Sue <[email protected]> */
-/* Provides functionallity for substituting dBase-fieldnames for others */
+/* Provides functionality for substituting dBase-fieldnames for others */
 /* Mainly for avoiding conflicts between fieldnames and SQL-reserved */
 /* keywords */
 
diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
index 7620c0640ce..4c5705ba74b 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -83,7 +83,7 @@
  *	 nothing in it, then re-populate the fti-table)
  *
  *	 can we do something with operator overloading or a seperate function
- *	 that can build the final query automatigally?
+ *	 that can build the final query automagically?
  */
 
 #define MAX_FTI_QUERY_LENGTH 8192
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index fbb16f66b33..0358fb2b66b 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -76,7 +76,7 @@ levenshtein(PG_FUNCTION_ARGS)
 	/*
 	 * Restrict the length of the strings being compared to something
 	 * reasonable because we will have to perform rows * cols
-	 * calcualtions. If longer strings need to be compared, increase
+	 * calculations. If longer strings need to be compared, increase
 	 * MAX_LEVENSHTEIN_STRLEN to suit (but within your tolerance for speed
 	 * and memory usage).
 	 */
@@ -250,7 +250,7 @@ metaphone(PG_FUNCTION_ARGS)
  *------------------------------------------------------------------*/
 
 /* I suppose I could have been using a character pointer instead of
- * accesssing the array directly... */
+ * accessing the array directly... */
 
 /* Look at the next letter in the word */
 #define Next_Letter (toupper((unsigned char) word[w_idx+1]))
@@ -421,7 +421,7 @@ _metaphone(
 		 w_idx++)
 	{
 		/*
-		 * How many letters to skip because an eariler encoding handled
+		 * How many letters to skip because an earlier encoding handled
 		 * multiple letters
 		 */
 		unsigned short int skip_letter = 0;
diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
index fc08137d4d4..1c14e7c2db7 100644
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -191,7 +191,7 @@ int_agg_state(PG_FUNCTION_ARGS)
 }
 
 /* This is the final function used for the integer aggregator. It returns all the integers
- * collected as a one dimentional integer array */
+ * collected as a one dimensional integer array */
 Datum
 int_agg_final_array(PG_FUNCTION_ARGS)
 {
@@ -225,7 +225,7 @@ int_enum(PG_FUNCTION_ARGS)
 		/* Allocate a working context */
 		pc = (CTX *) palloc(sizeof(CTX));
 
-		/* Don't copy atribute if you don't need too */
+		/* Don't copy attribute if you don't need too */
 		if (VARATT_IS_EXTENDED(p))
 		{
 			/* Toasted!!! */
diff --git a/contrib/intarray/_int.c b/contrib/intarray/_int.c
index 325d504d849..199a39adc9c 100644
--- a/contrib/intarray/_int.c
+++ b/contrib/intarray/_int.c
@@ -133,7 +133,7 @@ typedef ArrayType *(*formarray) (ArrayType *, ArrayType *);
 typedef void (*formfloat) (ArrayType *, float *);
 
 /*
-** usefull function
+** useful function
 */
 static bool isort(int4 *a, const int len);
 static ArrayType *new_intArrayType(int num);
@@ -446,7 +446,7 @@ g_int_decompress(PG_FUNCTION_ARGS)
 	lenin = ARRNELEMS(in);
 
 	if (lenin < 2 * MAXNUMRANGE || ISLEAFKEY(in))
-	{							/* not comressed value */
+	{							/* not compressed value */
 		if (in != (ArrayType *) DatumGetPointer(entry->key))
 		{
 			retval = palloc(sizeof(GISTENTRY));
@@ -1642,7 +1642,7 @@ typedef struct
 	char	   *buf;
 	int4		state;
 	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
+	/* reverse polish notation in list (for temporary usage) */
 	NODE	   *str;
 	/* number in str */
 	int4		num;
@@ -1747,7 +1747,7 @@ pushquery(WORKSTATE * state, int4 type, int4 val)
 #define STACKDEPTH	16
 
 /*
- * make polish notaion of query
+ * make polish notation of query
  */
 static int4
 makepol(WORKSTATE * state)
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index e9be1621d6c..c07abaa2282 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -38,7 +38,7 @@ typedef struct
 	char	   *buf;
 	int4		state;
 	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
+	/* reverse polish notation in list (for temporary usage) */
 	NODE	   *str;
 	/* number in str */
 	int4		num;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 155d54e7073..d6cb526a1a5 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -50,7 +50,7 @@ void		sql_exec_dumptable(PGconn *, int);
 void		sql_exec_searchtable(PGconn *, const char *);
 void		sql_exec_searchoid(PGconn *, int);
 
-/* fuction to parse command line options and check for some usage errors. */
+/* function to parse command line options and check for some usage errors. */
 void
 get_opts(int argc, char **argv, struct options * my_opts)
 {
diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c
index ce5f838a0c8..7984aee915d 100644
--- a/contrib/pgcrypto/random.c
+++ b/contrib/pgcrypto/random.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
+ * $Id: random.c,v 1.6 2003/03/10 22:28:17 tgl Exp $
  */
 
 
@@ -115,7 +115,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
 
 	/*
 	 * OpenSSL random should re-feeded occasionally. From /dev/urandom
-	 * preferrably.
+	 * preferably.
 	 */
 
 	res = RAND_bytes(dst, count);
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 4bc06d51be9..21e71e166cd 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -2,7 +2,7 @@
 moddatetime.c
 
 What is this?
-It is a function to be called from a trigger for the perpose of updating
+It is a function to be called from a trigger for the purpose of updating
 a modification datetime stamp in a record when that record is UPDATEd.
 
 Credits
@@ -70,14 +70,14 @@ moddatetime(PG_FUNCTION_ARGS)
 								Int32GetDatum(-1));
 
 	/*
-	 * This gets the position in the turple of the field we want. args[0]
+	 * This gets the position in the tuple of the field we want. args[0]
 	 * being the name of the field to update, as passed in from the
 	 * trigger.
 	 */
 	attnum = SPI_fnumber(tupdesc, args[0]);
 
 	/*
-	 * This is were we check to see if the feild we are suppost to update
+	 * This is were we check to see if the field we are supposed to update
 	 * even exits.	The above function must return -1 if name not found?
 	 */
 	if (attnum < 0)
diff --git a/contrib/string/string_io.c b/contrib/string/string_io.c
index fdc6da1915e..059dfa08947 100644
--- a/contrib/string/string_io.c
+++ b/contrib/string/string_io.c
@@ -166,7 +166,7 @@ string_output(unsigned char *data, int size)
  *
  * This function accepts a C string in input and copies it into a new
  * object allocated with palloc() translating all escape sequences.
- * An optional header can be allocatd before the string, for example
+ * An optional header can be allocated before the string, for example
  * to hold the length of a varlena object.
  * This function is not necessary for input from sql commands because
  * the parser already does escape translation, all data input routines
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 6b502dda001..a6d63fc9424 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -44,7 +44,7 @@ static bool compatCrosstabTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2);
 static bool compatConnectbyTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2);
 static void get_normal_pair(float8 *x1, float8 *x2);
 static TupleDesc make_crosstab_tupledesc(TupleDesc spi_tupdesc,
-						int num_catagories);
+						int num_categories);
 static Tuplestorestate *connectby(char *relname,
 		  char *key_fld,
 		  char *parent_key_fld,
@@ -373,9 +373,9 @@ crosstab(PG_FUNCTION_ARGS)
 				elog(ERROR, "Wrong number of arguments specified for function");
 			else
 			{
-				int			num_catagories = PG_GETARG_INT32(1);
+				int			num_categories = PG_GETARG_INT32(1);
 
-				tupdesc = make_crosstab_tupledesc(spi_tupdesc, num_catagories);
+				tupdesc = make_crosstab_tupledesc(spi_tupdesc, num_categories);
 			}
 		}
 		else if (functyptype == 'b')
@@ -1034,7 +1034,7 @@ compatCrosstabTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdesc)
 }
 
 static TupleDesc
-make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_catagories)
+make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_categories)
 {
 	Form_pg_attribute sql_attr;
 	Oid			sql_atttypid;
@@ -1046,10 +1046,10 @@ make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_catagories)
 
 	/*
 	 * We need to build a tuple description with one column for the
-	 * rowname, and num_catagories columns for the values. Each must be of
+	 * rowname, and num_categories columns for the values. Each must be of
 	 * the same type as the corresponding spi result input column.
 	 */
-	natts = num_catagories + 1;
+	natts = num_categories + 1;
 	tupdesc = CreateTemplateTupleDesc(natts, false);
 
 	/* first the rowname column */
@@ -1063,11 +1063,11 @@ make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_catagories)
 	TupleDescInitEntry(tupdesc, attnum, attname, sql_atttypid,
 					   -1, 0, false);
 
-	/* now the catagory values columns */
+	/* now the category values columns */
 	sql_attr = spi_tupdesc->attrs[2];
 	sql_atttypid = sql_attr->atttypid;
 
-	for (i = 0; i < num_catagories; i++)
+	for (i = 0; i < num_categories; i++)
 	{
 		attnum++;
 
diff --git a/contrib/tsearch/morph.c b/contrib/tsearch/morph.c
index 3acbef98623..2455a72d8dd 100644
--- a/contrib/tsearch/morph.c
+++ b/contrib/tsearch/morph.c
@@ -187,7 +187,7 @@ lemmatize(char *word, int *len, int type)
 				int			oldlen = *len;
 				char	   *newword = (*(dict->lemmatize)) (dictobjs[nd], word, len);
 
-				/* word is recognized by distionary */
+				/* word is recognized by dictionary */
 				if (newword != word || *len != oldlen)
 				{
 					if (dict->is_stemstoplemm &&
diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c
index 9d5e126c5bc..8253787320b 100644
--- a/contrib/tsearch/query.c
+++ b/contrib/tsearch/query.c
@@ -79,7 +79,7 @@ typedef struct
 	char	   *buf;
 	int4		state;
 	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
+	/* reverse polish notation in list (for temporary usage) */
 	NODE	   *str;
 	/* number in str */
 	int4		num;
@@ -247,7 +247,7 @@ pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval)
 
 #define STACKDEPTH	32
 /*
- * make polish notaion of query
+ * make polish notation of query
  */
 static int4
 makepol(QPRS_STATE * state, void (*pushval) (QPRS_STATE *, int, char *, int))
diff --git a/contrib/tsearch/rewrite.c b/contrib/tsearch/rewrite.c
index 33e948faf89..6cd3cb14e78 100644
--- a/contrib/tsearch/rewrite.c
+++ b/contrib/tsearch/rewrite.c
@@ -116,7 +116,7 @@ freetree(NODE * node)
 
 /*
  * clean tree for ! operator.
- * It's usefull for debug, but in
+ * It's useful for debug, but in
  * other case, such view is used with search in index.
  * Operator ! always return TRUE
  */