Initial attempt to clean up the code...

Switch sprintf() to snprintf()
Remove any/all #if 0 -or- #ifdef NOT_USED -or- #ifdef FALSE sections of
	code

Author: scrappy

src/backend/access/common/tupdesc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.45 1998/11/27 19:51:28 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.46 1998/12/14 05:18:30 scrappy Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -488,7 +488,8 @@ BuildDescForRelation(List *schema, char *relname)
 		if (arry != NIL)
 		{
 			/* array of XXX is _XXX */
-			sprintf(typename, "_%.*s", NAMEDATALEN - 2, entry->typename->name);
+			snprintf(typename, NAMEDATALEN,
+							 "_%.*s", NAMEDATALEN - 2, entry->typename->name);
 			attdim = length(arry);
 		}
 		else

src/backend/access/gist/gist.c

@@ -1326,34 +1326,6 @@ _gistdump(Relation r)
 	}
 }
 
-#ifdef NOT_USED
-static char *
-text_range_out(TXTRANGE *r)
-{
-	char	   *result;
-	char	   *lower,
-			   *upper;
-
-	if (r == NULL)
-		return NULL;
-	result = (char *) palloc(NAMEDATALEN + VARSIZE(TRLOWER(r)) + VARSIZE(TRUPPER(r))
-							 - 2 * VARHDRSZ);
-
-	lower = (char *) palloc(VARSIZE(TRLOWER(r)) + 1 - VARHDRSZ);
-	memcpy(lower, VARDATA(TRLOWER(r)), VARSIZE(TRLOWER(r)) - VARHDRSZ);
-	lower[VARSIZE(TRLOWER(r)) - VARHDRSZ] = '\0';
-	upper = (char *) palloc(VARSIZE(TRUPPER(r)) + 1 - VARHDRSZ);
-	memcpy(upper, VARDATA(TRUPPER(r)), VARSIZE(TRUPPER(r)) - VARHDRSZ);
-	upper[VARSIZE(TRUPPER(r)) - VARHDRSZ] = '\0';
-
-	sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
-	pfree(lower);
-	pfree(upper);
-	return result;
-}
-
-#endif
-
 static char *
 int_range_out(INTRANGE *r)
 {
@@ -1362,7 +1334,7 @@ int_range_out(INTRANGE *r)
 	if (r == NULL)
 		return NULL;
 	result = (char *) palloc(80);
-	sprintf(result, "[%d,%d): %d", r->lower, r->upper, r->flag);
+	snprintf(result, 80, "[%d,%d): %d", r->lower, r->upper, r->flag);
 
 	return result;
 }

src/backend/access/transam/xid.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.18 1998/10/08 18:29:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.19 1998/12/14 05:18:33 scrappy Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -53,18 +53,6 @@ xidout(TransactionId transactionId)
 
 }
 
-#ifdef NOT_USED
-/* ----------------------------------------------------------------
- *		TransactionIdIsLessThan
- * ----------------------------------------------------------------
- */
-bool
-TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
-{
-	return (bool) (id1 < id2);
-}
-#endif
-
 /* ----------------------------------------------------------------
  *		xideq
  * ----------------------------------------------------------------
@@ -82,23 +70,6 @@ xideq(TransactionId xid1, TransactionId xid2)
 
 
 
-/* ----------------------------------------------------------------
- *		TransactionIdIncrement
- * ----------------------------------------------------------------
- */
-#ifdef NOT_USED
-void
-TransactionIdIncrement(TransactionId *transactionId)
-{
-
-	(*transactionId)++;
-	if (*transactionId == DisabledTransactionId)
-		elog(FATAL, "TransactionIdIncrement: exhausted XID's");
-	return;
-}
-
-#endif
-
 /* ----------------------------------------------------------------
  *		TransactionIdAdd
  * ----------------------------------------------------------------

src/backend/catalog/catalog.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.18 1998/09/01 04:27:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.19 1998/12/14 05:18:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,40 +29,19 @@
 char *
 relpath(char *relname)
 {
-	char	   *path;
+	char	*path;
+	int		bufsize = 0;
 
 	if (IsSharedSystemRelationName(relname))
 	{
-		path = (char *) palloc(strlen(DataDir) + sizeof(NameData) + 2);
-		sprintf(path, "%s/%s", DataDir, relname);
+		bufsize = strlen(DataDir) + sizeof(NameData) + 2;
+		path = (char *) palloc(bufsize);
+		snprintf(path, bufsize, "%s/%s", DataDir, relname);
 		return path;
 	}
 	return relname;
 }
 
-#ifdef NOT_USED
-/*
- * issystem		- returns non-zero iff relname is a system catalog
- *
- *		We now make a new requirement where system catalog relns must begin
- *		with pg_ while user relns are forbidden to do so.  Make the test
- *		trivial and instantaneous.
- *
- *		XXX this is way bogus. -- pma
- */
-bool
-issystem(char *relname)
-{
-	if (relname[0] && relname[1] && relname[2])
-		return (relname[0] == 'p' &&
-				relname[1] == 'g' &&
-				relname[2] == '_');
-	else
-		return FALSE;
-}
-
-#endif
-
 /*
  * IsSystemRelationName --
  *		True iff name is the name of a system catalog relation.

src/backend/catalog/heap.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.68 1998/12/13 23:50:58 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.69 1998/12/14 05:18:37 scrappy Exp $
  *
  * INTERFACE ROUTINES
  *		heap_create()			- Create an uncataloged heap relation
@@ -244,7 +244,7 @@ heap_create(char *name,
 
 		if (name[0] == '\0')
 		{
-			sprintf(tempname, "temp_%d", relid);
+			snprintf(tempname, NAMEDATALEN, "temp_%d", relid);
 			Assert(strlen(tempname) < NAMEDATALEN);
 			relname = tempname;
 			isTemp = 1;
@@ -1448,8 +1448,9 @@ start:;
 	/* Surround table name with double quotes to allow mixed-case and
 	 * whitespaces in names. - BGA 1998-11-14
 	 */
-	sprintf(str, "select %s%s from \"%.*s\"", attrdef->adsrc, cast,
-			NAMEDATALEN, rel->rd_rel->relname.data);
+	snprintf(str, MAX_PARSE_BUFFER, 
+			 "select %s%s from \"%.*s\"", attrdef->adsrc, cast,
+			 NAMEDATALEN, rel->rd_rel->relname.data);
 	setheapoverride(true);
 	planTree_list = (List *) pg_parse_and_plan(str, NULL, 0, &queryTree_list, None, FALSE);
 	setheapoverride(false);
@@ -1463,22 +1464,6 @@ start:;
 	expr = te->expr;
 	type = exprType(expr);
 
-#if 0
-	if (IsA(expr, Const))
-	{
-		if (((Const *) expr)->consttype != atp->atttypid)
-		{
-			if (*cast != 0)
-				elog(ERROR, "DEFAULT: const type mismatched");
-			sprintf(cast, ":: %s", typeidTypeName(atp->atttypid));
-			goto start;
-		}
-	}
-	else if ((exprType(expr) != atp->atttypid)
-			 && !IS_BINARY_COMPATIBLE(exprType(expr), atp->atttypid))
-		elog(ERROR, "DEFAULT: type mismatched");
-#endif
-
 	if (type != atp->atttypid)
 	{
 		if (IS_BINARY_COMPATIBLE(type, atp->atttypid))
@@ -1490,7 +1475,7 @@ start:;
 			if (*cast != 0)
 				elog(ERROR, "DEFAULT clause const type '%s' mismatched with column type '%s'",
 					 typeidTypeName(type), typeidTypeName(atp->atttypid));
-			sprintf(cast, ":: %s", typeidTypeName(atp->atttypid));
+			snprintf(cast, 2*NAMEDATALEN, ":: %s", typeidTypeName(atp->atttypid));
 			goto start;
 		}
 		else
@@ -1544,7 +1529,8 @@ StoreRelCheck(Relation rel, ConstrCheck *check)
 	/* Check for table's existance. Surround table name with double-quotes
 	 * to allow mixed-case and whitespace names. - thomas 1998-11-12
 	 */
-	sprintf(str, "select 1 from \"%.*s\" where %s",
+	snprintf(str, MAX_PARSE_BUFFER, 
+			"select 1 from \"%.*s\" where %s",
 			NAMEDATALEN, rel->rd_rel->relname.data, check->ccsrc);
 	setheapoverride(true);
 	planTree_list = (List *) pg_parse_and_plan(str, NULL, 0, &queryTree_list, None, FALSE);

src/backend/commands/_deadcode/version.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.15 1998/09/01 04:28:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.16 1998/12/14 05:18:44 scrappy Exp $
  *
  * NOTES
  *	  At the point the version is defined, 2 physical relations are created
@@ -37,11 +37,6 @@
 
 char		rule_buf[MAX_QUERY_LEN];
 
-#ifdef NOT_USED
-static char attr_list[MAX_QUERY_LEN];
-
-#endif
-
 /*
  * problem: the version system assumes that the rules it declares will
  *			be fired in the order of declaration, it also assumes

src/backend/commands/cluster.c

@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.33 1998/11/27 19:51:54 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.34 1998/12/14 05:18:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -165,7 +165,7 @@ cluster(char *oldrelname, char *oldindexname)
 
 	/* Create new index over the tuples of the new heap. */
 	copy_index(OIDOldIndex, OIDNewHeap);
-	sprintf(NewIndexName, "temp_%x", OIDOldIndex);
+	snprintf(NewIndexName, NAMEDATALEN, "temp_%x", OIDOldIndex);
 
 	/*
 	 * make this really happen. Flush all the buffers. (Believe me, it is
@@ -207,7 +207,7 @@ copy_heap(Oid OIDOldHeap)
 	 * Create a new heap relation with a temporary name, which has the
 	 * same tuple description as the old one.
 	 */
-	sprintf(NewName, "temp_%x", OIDOldHeap);
+	snprintf(NewName, NAMEDATALEN, "temp_%x", OIDOldHeap);
 
 	OldHeap = heap_open(OIDOldHeap);
 	OldHeapDesc = RelationGetDescr(OldHeap);
@@ -235,17 +235,17 @@ copy_heap(Oid OIDOldHeap)
 static void
 copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
 {
-	Relation	OldIndex,
-				NewHeap;
-	HeapTuple	Old_pg_index_Tuple,
-				Old_pg_index_relation_Tuple,
-				pg_proc_Tuple;
+	Relation			OldIndex,
+								NewHeap;
+	HeapTuple			Old_pg_index_Tuple,
+								Old_pg_index_relation_Tuple,
+								pg_proc_Tuple;
 	Form_pg_index Old_pg_index_Form;
 	Form_pg_class Old_pg_index_relation_Form;
-	Form_pg_proc pg_proc_Form;
-	char	   *NewIndexName;
-	AttrNumber *attnumP;
-	int			natts;
+	Form_pg_proc	pg_proc_Form;
+	char					*NewIndexName;
+	AttrNumber		*attnumP;
+	int						natts;
 	FuncIndexInfo *finfo;
 
 	NewHeap = heap_open(OIDNewHeap);
@@ -273,8 +273,9 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
 	Old_pg_index_relation_Form =
 		(Form_pg_class) GETSTRUCT(Old_pg_index_relation_Tuple);
 
+	/* Set the name. */
 	NewIndexName = palloc(NAMEDATALEN); /* XXX */
-	sprintf(NewIndexName, "temp_%x", OIDOldIndex);		/* Set the name. */
+	snprintf(NewIndexName, NAMEDATALEN, "temp_%x", OIDOldIndex);
 
 	/*
 	 * Ugly as it is, the only way I have of working out the number of

src/backend/commands/creatinh.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.36 1998/11/27 19:51:55 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.37 1998/12/14 05:18:43 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -90,11 +90,11 @@ DefineRelation(CreateStmt *stmt, char relkind)
 
 	if (constraints != NIL)
 	{
-		List	   *entry;
-		int			nconstr = length(constraints);
+		List				*entry;
+		int					nconstr = length(constraints),
+								ncheck = 0,
+								i;
 		ConstrCheck *check = (ConstrCheck *) palloc(nconstr * sizeof(ConstrCheck));
-		int			ncheck = 0;
-		int			i;
 
 		foreach(entry, constraints)
 		{
@@ -107,14 +107,16 @@ DefineRelation(CreateStmt *stmt, char relkind)
 					for (i = 0; i < ncheck; i++)
 					{
 						if (strcmp(check[i].ccname, cdef->name) == 0)
-							elog(ERROR, "DefineRelation: name (%s) of CHECK constraint duplicated", cdef->name);
+							elog(ERROR, 
+								"DefineRelation: name (%s) of CHECK constraint duplicated", 
+								cdef->name);
 					}
 					check[ncheck].ccname = cdef->name;
 				}
 				else
 				{
 					check[ncheck].ccname = (char *) palloc(NAMEDATALEN);
-					sprintf(check[ncheck].ccname, "$%d", ncheck + 1);
+					snprintf(check[ncheck].ccname, NAMEDATALEN, "$%d", ncheck + 1);
 				}
 				check[ncheck].ccbin = NULL;
 				check[ncheck].ccsrc = (char *) cdef->def;