--- postgresql-7.0.3/src/interfaces/libpq++/pgdatabase.cc	Sat Jan 29 17:58:52 2000
+++ postgresql-7.0.3-jtv/src/interfaces/libpq++/pgdatabase.cc	Mon Feb 26 15:09:59 2001
@@ -18,57 +18,57 @@
 #include "pgdatabase.h"
 
 
-void PgDatabase::DisplayTuples(FILE *out, int fillAlign, 
-							   const char* fieldSep, int printHeader,
-							   int /* quiet */) 
+// OBSOLESCENT (uses PQprint(), which is no longer being maintained)
+void PgDatabase::DisplayTuples(FILE *out, 
+	bool fillAlign, 
+	const char* fieldSep, 
+	bool printHeader,
+	bool /* quiet */) const
 {
 	PQprintOpt po;
 
-	memset(&po,0,sizeof(po));
-
-	po.align = fillAlign;
-	po.fieldSep = (char *)fieldSep;
 	po.header = printHeader;
+	po.align = fillAlign;
+	po.standard = po.html3 = po.expanded = po.pager = 0;
+	po.fieldSep = const_cast<char *>(fieldSep);
+	po.tableOpt = po.caption = 0;
+	po.fieldName = 0;
 
 	PQprint(out,pgResult,&po);
 }
 
 
 
-
-void PgDatabase::PrintTuples(FILE *out, int printAttName, int terseOutput,
-							 int width)
+// OBSOLESCENT (uses PQprint(), which is no longer being maintained)
+void PgDatabase::PrintTuples(FILE *out, 
+	bool printAttName, 
+	bool terseOutput,
+	bool fillAlign) const
 {
 	PQprintOpt po;
 
-	memset(&po,0,sizeof(po));
-
-	po.align = width;
-
-	if(terseOutput) po.fieldSep = strdup("|");
-	else po.fieldSep = "";
-
 	po.header = printAttName;
+	po.align = fillAlign;
+	po.standard = po.html3 = po.expanded = po.pager = 0;
+	po.tableOpt = po.caption = 0;
+	po.fieldSep = const_cast<char *>(terseOutput ? "" : "|");
+	po.fieldName = 0;
 
 	PQprint(out,pgResult,&po);
 }
 
 
 
-int PgDatabase::Tuples()
+int PgDatabase::Tuples() const
 { 
 return PQntuples(pgResult); 
 }
 
 
-int PgDatabase::CmdTuples()
+int PgDatabase::CmdTuples() const
 {
-char *a;
-
-  a = (char *)PQcmdTuples(pgResult);
-  if(!a[0]) return -1;
-
-return atoi(a);
+const char *a = PQcmdTuples(pgResult);
+return a[0] ? atoi(a) : -1;
 }
 
 
@@ -78,91 +78,91 @@
 }
 
 
-const char* PgDatabase::FieldName(int field_num)
+const char* PgDatabase::FieldName(int field_num) const
 { 
 return PQfname(pgResult, field_num); 
 }
 
 
-int PgDatabase::FieldNum(const char* field_name)
+int PgDatabase::FieldNum(const char* field_name) const
 { 
 return PQfnumber(pgResult, field_name); 
 }
 
 
-Oid PgDatabase::FieldType(int field_num)
+Oid PgDatabase::FieldType(int field_num) const
 { 
 return PQftype(pgResult, field_num); 
 }
 
 
-Oid PgDatabase::FieldType(const char* field_name)
+Oid PgDatabase::FieldType(const char* field_name) const
 { 
 return PQftype(pgResult, FieldNum(field_name)); 
 }
 
 
-short PgDatabase::FieldSize(int field_num)
+short PgDatabase::FieldSize(int field_num) const
 { 
 return PQfsize(pgResult, field_num); 
 }
 
 
-short PgDatabase::FieldSize(const char* field_name)
+short PgDatabase::FieldSize(const char* field_name) const
 { 
 return PQfsize(pgResult, FieldNum(field_name)); 
 }
 
 
-const char* PgDatabase::GetValue(int tup_num, int field_num)
+const char* PgDatabase::GetValue(int tup_num, int field_num) const
 { 
 return PQgetvalue(pgResult, tup_num, field_num); 
 }
 
 
-const char* PgDatabase::GetValue(int tup_num, const char* field_name)
+const char* PgDatabase::GetValue(int tup_num, const char* field_name) const
 { 
 return PQgetvalue(pgResult, tup_num, FieldNum(field_name)); 
 }
 
 
-int PgDatabase::GetIsNull(int tup_num, int field_num)
+bool PgDatabase::GetIsNull(int tup_num, int field_num) const
 { 
 return PQgetisnull(pgResult, tup_num, field_num); 
 }
 
 
-int PgDatabase::GetIsNull(int tup_num, const char* field_name)
+bool PgDatabase::GetIsNull(int tup_num, const char* field_name) const
 { 
 return PQgetisnull(pgResult, tup_num, FieldNum(field_name)); 
 }
 
 
-int PgDatabase::GetLength(int tup_num, int field_num)
+int PgDatabase::GetLength(int tup_num, int field_num) const
 { 
 return PQgetlength(pgResult, tup_num, field_num); 
 }
 
 
-int PgDatabase::GetLength(int tup_num, const char* field_name)
+int PgDatabase::GetLength(int tup_num, const char* field_name) const
 { 
 return PQgetlength(pgResult, tup_num, FieldNum(field_name)); 
 }
 
 
-int PgDatabase::GetLine(char* string, int length)
+int PgDatabase::GetLine(char str[], int length)
 { 
-return PQgetline(pgConn, string, length); 
+return PQgetline(pgConn, str, length); 
 }
 
 
-void PgDatabase::PutLine(const char* string)
+void PgDatabase::PutLine(const char str[])
 { 
-PQputline(pgConn, string); 
+PQputline(pgConn, str); 
 }
 
 
-const char* PgDatabase::OidStatus()
+const char* PgDatabase::OidStatus() const
 { 
 return PQoidStatus(pgResult); 
 }