From 0da6358f373c2736626b4189a3e7e413e107b9a0 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 20 Jul 1998 16:57:18 +0000
Subject: [PATCH] Cleanup use of 16 that should be NAMEDATALEN.

---
 src/backend/access/gist/gist.c      |  2 +-
 src/backend/access/heap/heapam.c    |  8 ++++----
 src/backend/storage/ipc/shmqueue.c  |  4 ++--
 src/backend/storage/smgr/md.c       |  8 ++++----
 src/backend/tcop/dest.c             |  5 ++---
 src/backend/utils/adt/regproc.c     |  7 ++++---
 src/backend/utils/adt/sets.c        |  4 ++--
 src/backend/utils/cache/catcache.c  |  4 ++--
 src/backend/utils/cache/syscache.c  |  6 +++---
 src/include/libpq/libpq.h           |  4 ++--
 src/include/storage/buf_internals.h | 11 +----------
 src/interfaces/libpq/fe-auth.c      |  4 ++--
 src/interfaces/odbc/connection.h    |  2 +-
 src/test/regress/regress.c          | 10 +++++-----
 14 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index efa5286c1f..5003204df4 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -1347,7 +1347,7 @@ text_range_out(TXTRANGE *r)
 
 	if (r == NULL)
 		return (NULL);
-	result = (char *) palloc(16 + VARSIZE(TRLOWER(r)) + VARSIZE(TRUPPER(r))
+	result = (char *) palloc(NAMEDATALEN + VARSIZE(TRLOWER(r)) + VARSIZE(TRUPPER(r))
 							 - 2 * VARHDRSZ);
 
 	lower = (char *) palloc(VARSIZE(TRLOWER(r)) + 1 - VARHDRSZ);
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index b23b658f40..10c0abd2cd 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.29 1998/06/16 02:53:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.30 1998/07/20 16:56:53 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -239,18 +239,18 @@ heapgettup(Relation relation,
 #ifdef	HEAPDEBUGALL
 	if (ItemPointerIsValid(tid))
 	{
-		elog(DEBUG, "heapgettup(%.16s, tid=0x%x[%d,%d], dir=%d, ...)",
+		elog(DEBUG, "heapgettup(%s, tid=0x%x[%d,%d], dir=%d, ...)",
 			 RelationGetRelationName(relation), tid, tid->ip_blkid,
 			 tid->ip_posid, dir);
 	}
 	else
 	{
-		elog(DEBUG, "heapgettup(%.16s, tid=0x%x, dir=%d, ...)",
+		elog(DEBUG, "heapgettup(%s, tid=0x%x, dir=%d, ...)",
 			 RelationGetRelationName(relation), tid, dir);
 	}
 	elog(DEBUG, "heapgettup(..., b=0x%x, nkeys=%d, key=0x%x", b, nkeys, key);
 
-	elog(DEBUG, "heapgettup: relation(%c)=`%.16s', %s",
+	elog(DEBUG, "heapgettup: relation(%c)=`%s', %s",
 		 relation->rd_rel->relkind, &relation->rd_rel->relname,
 		 (seeself == true) ? "SeeSelf" : "NoSeeSelf");
 #endif							/* !defined(HEAPDEBUGALL) */
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index caba5ff637..c3156fbb35 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.6 1997/09/08 21:47:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.7 1998/07/20 16:56:54 momjian Exp $
  *
  * NOTES
  *
@@ -99,7 +99,7 @@ SHMQueueDelete(SHM_QUEUE *queue)
 void
 dumpQ(SHM_QUEUE *q, char *s)
 {
-	char		elem[16];
+	char		elem[NAMEDATALEN];
 	char		buf[1024];
 	SHM_QUEUE  *start = q;
 	int			count = 0;
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 30246281eb..ba67413bdc 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.32 1998/07/20 16:14:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.33 1998/07/20 16:56:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -686,7 +686,7 @@ mdnblocks(Relation reln)
 			{
 				v->mdfd_chain = _mdfd_openseg(reln, segno, O_CREAT);
 				if (v->mdfd_chain == (MdfdVec *) NULL)
-					elog(ERROR, "cannot count blocks for %.16s -- open failed",
+					elog(ERROR, "cannot count blocks for %s -- open failed",
 						 RelationGetRelationName(reln));
 			}
 
@@ -940,7 +940,7 @@ _mdfd_getseg(Relation reln, int blkno, int oflag)
 	if (fd < 0)
 	{
 		if ((fd = mdopen(reln)) < 0)
-			elog(ERROR, "cannot open relation %.16s",
+			elog(ERROR, "cannot open relation %s",
 				 RelationGetRelationName(reln));
 		reln->rd_fd = fd;
 	}
@@ -956,7 +956,7 @@ _mdfd_getseg(Relation reln, int blkno, int oflag)
 			v->mdfd_chain = _mdfd_openseg(reln, i, oflag);
 
 			if (v->mdfd_chain == (MdfdVec *) NULL)
-				elog(ERROR, "cannot open segment %d of relation %.16s",
+				elog(ERROR, "cannot open segment %d of relation %s",
 					 i, RelationGetRelationName(reln));
 		}
 		v = v->mdfd_chain;
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 3f21bc481a..da1c40db8c 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.20 1998/05/19 18:05:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.21 1998/07/20 16:56:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -284,8 +284,7 @@ BeginCommand(char *pname,
 
 				for (i = 0; i < natts; ++i)
 				{
-					pq_putstr(attrs[i]->attname.data);	/* if 16 char name
-														 * oops.. */
+					pq_putstr(attrs[i]->attname.data);
 					pq_putint((int) attrs[i]->atttypid, sizeof(attrs[i]->atttypid));
 					pq_putint(attrs[i]->attlen, sizeof(attrs[i]->attlen));
 					if (PG_PROTOCOL_MAJOR(FrontendProtocol) >= 2)
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 96263e9da4..e6509f4beb 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.19 1998/06/15 19:29:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.20 1998/07/20 16:57:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,7 +130,7 @@ regprocout(RegProcedure proid)
 							  RelationGetTupleDescriptor(proc), &isnull);
 			if (!isnull)
 			{
-				StrNCpy(result, s, 16);
+				StrNCpy(result, s, NAMEDATALEN);
 				break;
 			}
 			elog(FATAL, "regprocout: null procedure %d", proid);
@@ -207,7 +207,8 @@ oid8types(Oid (*oidArray)[])
 							  RelationGetTupleDescriptor(type), &isnull);
 				if (!isnull)
 				{
-					StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s, 16);
+					StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s,
+							NAMEDATALEN);
 					strcat(VARDATA(result), " ");
 				}
 				else
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index ae12118d1c..577d336015 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.13 1998/04/27 04:07:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.14 1998/07/20 16:57:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@ SetDefine(char *querystr, char *typename)
 	Oid			setoid;
 	char	   *procname = GENERICSETNAME;
 	char	   *fileName = "-";
-	char		realprocname[16];
+	char		realprocname[NAMEDATALEN];
 	HeapTuple	tup,
 				newtup = NULL;
 	Form_pg_proc proc;
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 2a4a860546..9687db978a 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.29 1998/06/15 19:29:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.30 1998/07/20 16:57:03 momjian Exp $
  *
  * Notes:
  *		XXX This needs to use exception.h to handle recovery when
@@ -220,7 +220,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
 					  &cache->cc_skey[i].sk_func);
 			cache->cc_skey[i].sk_nargs = cache->cc_skey[i].sk_func.fn_nargs;
 
-			CACHE5_elog(DEBUG, "CatalogCacheInit %16s %d %d %x",
+			CACHE5_elog(DEBUG, "CatalogCacheInit %s %d %d %x",
 						&relation->rd_rel->relname,
 						i,
 						tupdesc->attrs[cache->cc_key[i] - 1]->attlen,
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 0348fa3481..e98a26a60b 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.18 1998/06/15 19:29:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.19 1998/07/20 16:57:05 momjian Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -372,7 +372,7 @@ InitCatalogCache()
 			if (!PointerIsValid((char *) SysCache[cacheId]))
 			{
 				elog(ERROR,
-					 "InitCatalogCache: Can't init cache %.16s(%d)",
+					 "InitCatalogCache: Can't init cache %s(%d)",
 					 cacheinfo[cacheId].name,
 					 cacheId);
 			}
@@ -419,7 +419,7 @@ SearchSysCacheTuple(int cacheId,/* cache selection code */
 						 cacheinfo[cacheId].iScanFunc);
 		if (!PointerIsValid(SysCache[cacheId]))
 			elog(ERROR,
-				 "InitCatalogCache: Can't init cache %.16s(%d)",
+				 "InitCatalogCache: Can't init cache %s(%d)",
 				 cacheinfo[cacheId].name,
 				 cacheId);
 	}
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index 4b2f95056b..a328e6dacd 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.19 1998/07/18 18:34:23 momjian Exp $
+ * $Id: libpq.h,v 1.20 1998/07/20 16:57:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,7 +44,7 @@ typedef struct
  *		Information about an attribute.
  * ----------------
  */
-#define NameLength 16
+#define NameLength NAMEDATALEN
 
 typedef struct TypeBlock
 {
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index ab4a6f288d..0a419784f1 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf_internals.h,v 1.23 1998/07/13 16:34:55 momjian Exp $
+ * $Id: buf_internals.h,v 1.24 1998/07/20 16:57:10 momjian Exp $
  *
  * NOTE
  *		If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -86,15 +86,6 @@ struct buftag
 #define BAD_BUFFER_ID(bid) ((bid<1) || (bid>(NBuffers)))
 #define INVALID_DESCRIPTOR (-3)
 
-/*
- *	bletch hack -- anyplace that we declare space for relation or
- *	database names, we just use '16', not a symbolic constant, to
- *	specify their lengths.	BM_NAMESIZE is the length of these names,
- *	and is used in the buffer manager code.  somebody with lots of
- *	spare time should do this for all the other modules, too.
- */
-#define BM_NAMESIZE		16
-
 /*
  *	struct sbufdesc -- shared buffer cache metadata for a single
  *					   shared buffer descriptor.
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index de4cde24e5..430a8c3789 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.19 1998/07/09 03:32:09 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.20 1998/07/20 16:57:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,7 @@
 
 struct authsvc
 {
-	char		name[16];		/* service nickname (for command line) */
+	char		name[NAMEDATALEN];	/* service nickname (for command line) */
 	MsgType		msgtype;		/* startup packet header type */
 	int			allowed;		/* initially allowed (before command line
 								 * option parsing)? */
diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h
index e5d380c5cf..c1b4c32e28 100644
--- a/src/interfaces/odbc/connection.h
+++ b/src/interfaces/odbc/connection.h
@@ -83,7 +83,7 @@ typedef enum {
 #define NO_AUTHENTICATION	7
 #define PATH_SIZE			64
 #define ARGV_SIZE			64
-#define NAMEDATALEN			16
+#define NAMEDATALEN			32
 
 typedef unsigned int ProtocolVersion;
 
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index ec4ce8c12f..afc48d7644 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.26 1998/04/26 04:10:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.27 1998/07/20 16:57:18 momjian Exp $
  */
 
 #include <float.h>				/* faked on sunos */
@@ -283,15 +283,15 @@ char	   *string;
 	int			len;
 	char	   *new_string;
 
-	if (!(new_string = palloc(16)))
+	if (!(new_string = palloc(NAMEDATALEN)))
 	{
 		fprintf(stderr, "reverse_name: palloc failed\n");
 		return (NULL);
 	}
-	MemSet(new_string, 0, 16);
-	for (i = 0; i < 16 && string[i]; ++i)
+	MemSet(new_string, 0, NAMEDATALEN);
+	for (i = 0; i < NAMEDATALEN && string[i]; ++i)
 		;
-	if (i == 16 || !string[i])
+	if (i == NAMEDATALEN || !string[i])
 		--i;
 	len = i;
 	for (; i >= 0; --i)
-- 
GitLab