Inline function, rename libpq variablees, change lrel to lockrel.

3 files changed, 9 insertions, 9 deletions

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 2a80e2215ca..0feb26ca31c 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.58 1998/07/13 02:41:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.59 1998/07/13 16:35:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -497,12 +497,12 @@ getRowDescriptions(PGconn *conn)
 	for (i = 0; i < nfields; i++)
 	{
 		char		typName[MAX_MESSAGE_LEN];
-		int			adtid;
+		int			typid;
 		int			typlen;
 		int			atttypmod = -1;
 
 		if (pqGets(typName, MAX_MESSAGE_LEN, conn) ||
-			pqGetInt(&adtid, 4, conn) ||
+			pqGetInt(&typid, 4, conn) ||
 			pqGetInt(&typlen, 2, conn) ||
 			pqGetInt(&atttypmod, 4, conn))
 		{
@@ -510,7 +510,7 @@ getRowDescriptions(PGconn *conn)
 			return EOF;
 		}
 		result->attDescs[i].name = strdup(typName);
-		result->attDescs[i].adtid = adtid;
+		result->attDescs[i].typid = typid;
 		result->attDescs[i].typlen = (short) typlen;
 		result->attDescs[i].atttypmod = atttypmod;
 	}
@@ -1272,7 +1272,7 @@ PQftype(PGresult *res, int field_num)
 		return InvalidOid;
 	}
 	if (res->attDescs)
-		return res->attDescs[field_num].adtid;
+		return res->attDescs[field_num].typid;
 	else
 		return InvalidOid;
 }
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 0067199ccff..262f7629e39 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.33 1998/07/13 02:41:59 momjian Exp $
+ * $Id: libpq-fe.h,v 1.34 1998/07/13 16:35:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,8 +76,8 @@ extern		"C"
 	typedef struct pgresAttDesc
 	{
 		char	   *name;		/* type name */
-		Oid			adtid;		/* type id */
-		short		adtsize;	/* type size */
+		Oid			typid;		/* type id */
+		short		typlen;	/* type size */
 		int			atttypmod;	/* type-specific modifier info */
 	} PGresAttDesc;
 
diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c
index b52ef601e9b..e5cfa86c5f9 100644
--- a/src/interfaces/odbc/pgtypes.c
+++ b/src/interfaces/odbc/pgtypes.c
@@ -223,7 +223,7 @@ mylog("getCharPrecision: type=%d, col=%d, unknown = %d\n", type,col,handle_unkno
 	if (stmt->manual_result) {
 		flds = result->fields;
 		if (flds)
-			return flds->adtsize[col];
+			return flds->typlen[col];
 		else
 			return maxsize;
 	}