From 8bac4ca87b6cdaaf8fcea1e78c31be64ee4312ea Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 13 Jul 1998 02:41:59 +0000
Subject: [PATCH] Rename libpq to use more normal field names.

---
 src/interfaces/libpq/fe-exec.c  | 18 +++++++++---------
 src/interfaces/libpq/libpq-fe.h |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index d4a30b8fc9..2a80e2215c 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.57 1998/07/13 00:01:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.58 1998/07/13 02:41:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -498,21 +498,21 @@ getRowDescriptions(PGconn *conn)
 	{
 		char		typName[MAX_MESSAGE_LEN];
 		int			adtid;
-		int			adtsize;
-		int			adtmod = -1;
+		int			typlen;
+		int			atttypmod = -1;
 
 		if (pqGets(typName, MAX_MESSAGE_LEN, conn) ||
 			pqGetInt(&adtid, 4, conn) ||
-			pqGetInt(&adtsize, 2, conn) ||
-			pqGetInt(&adtmod, 4, conn))
+			pqGetInt(&typlen, 2, conn) ||
+			pqGetInt(&atttypmod, 4, conn))
 		{
 			PQclear(result);
 			return EOF;
 		}
 		result->attDescs[i].name = strdup(typName);
 		result->attDescs[i].adtid = adtid;
-		result->attDescs[i].adtsize = (short) adtsize;
-		result->attDescs[i].adtmod = adtmod;
+		result->attDescs[i].typlen = (short) typlen;
+		result->attDescs[i].atttypmod = atttypmod;
 	}
 
 	/* Success! */
@@ -1294,7 +1294,7 @@ PQfsize(PGresult *res, int field_num)
 		return 0;
 	}
 	if (res->attDescs)
-		return res->attDescs[field_num].adtsize;
+		return res->attDescs[field_num].typlen;
 	else
 		return 0;
 }
@@ -1316,7 +1316,7 @@ PQfmod(PGresult *res, int field_num)
 		return 0;
 	}
 	if (res->attDescs)
-		return res->attDescs[field_num].adtmod;
+		return res->attDescs[field_num].atttypmod;
 	else
 		return 0;
 }
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 18c4a5f132..0067199ccf 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.32 1998/07/13 00:01:45 momjian Exp $
+ * $Id: libpq-fe.h,v 1.33 1998/07/13 02:41:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ extern		"C"
 		char	   *name;		/* type name */
 		Oid			adtid;		/* type id */
 		short		adtsize;	/* type size */
-		int			adtmod;		/* type-specific modifier info */
+		int			atttypmod;	/* type-specific modifier info */
 	} PGresAttDesc;
 
 /* use char* for Attribute values,
-- 
2.40.0