From a68a132a6c0f90e5d03e8409e843e6117d5412a2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Sat, 6 Dec 1997 22:57:36 +0000
Subject: Add VARHDRSZ where needed.  Many places just used 4.

---
 src/backend/tcop/dest.c     | 10 +++++-----
 src/backend/tcop/fastpath.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/backend/tcop')

diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 81c80288465..c808a46e1d0 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.14 1997/11/27 03:01:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.15 1997/12/06 22:57:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -192,9 +192,9 @@ NullCommand(CommandDest dest)
 					 nPtr = (PQNotifyList *) SLGetSucc(&nPtr->Node))
 				{
 					pq_putnchar("A", 1);
-					pq_putint(0, 4);
+					pq_putint(0, sizeof(int4));
 					pq_putstr(nPtr->relname);
-					pq_putint(nPtr->be_pid, 4);
+					pq_putint(nPtr->be_pid, sizeof(nPtr->be_pid));
 					PQremoveNotify(nPtr);
 				}
 				pq_flush();
@@ -283,8 +283,8 @@ BeginCommand(char *pname,
 				{
 					pq_putstr(attrs[i]->attname.data);	/* if 16 char name
 														 * oops.. */
-					pq_putint((int) attrs[i]->atttypid, 4);
-					pq_putint(attrs[i]->attlen, 2);
+					pq_putint((int) attrs[i]->atttypid, sizeof(attrs[i]->atttypid));
+					pq_putint(attrs[i]->attlen, sizeof(attrs[i]->attlen));
 				}
 			}
 			break;
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 0573ea2fc88..b4fb2ebaec4 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.7 1997/09/18 20:21:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.8 1997/12/06 22:57:03 momjian Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -101,7 +101,7 @@ SendFunctionResult(Oid fid,		/* function id */
 		{						/* by-reference ... */
 			if (retlen < 0)
 			{					/* ... varlena */
-				pq_putint(VARSIZE(retval) - VARHDRSZ, 4);
+				pq_putint(VARSIZE(retval) - VARHDRSZ, VARHDRSZ);
 				pq_putnchar(VARDATA(retval), VARSIZE(retval) - VARHDRSZ);
 			}
 			else
-- 
cgit v1.2.3