Repair unintentional damage to MULTIBYTE code.

tglsfdc · tglsfdc · commit a50f2fd76e32 · 2000-03-14T23:59:23.000Z
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.92 2000/03/11 03:08:36 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.93 2000/03/14 23:59:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -153,8 +153,11 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status)
 
 	if (conn)
 	{
+		/* copy connection data we might need for operations on PGresult */
 		result->noticeHook = conn->noticeHook;
 		result->noticeArg = conn->noticeArg;
+		result->client_encoding = conn->client_encoding;
+
 		/* consider copying conn's errorMessage */
 		switch (status)
 		{
@@ -172,8 +175,10 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status)
 	}
 	else
 	{
+		/* defaults... */
 		result->noticeHook = NULL;
 		result->noticeArg = NULL;
+		result->client_encoding = 0; /* should be SQL_ASCII */
 	}
 
 	return result;
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
@@ -10,7 +10,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.35 2000/02/07 23:10:11 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.36 2000/03/14 23:59:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -347,7 +347,7 @@ do_field(const PQprintOpt *po, const PGresult *res,
 			char		ch = '0';
 
 #ifdef MULTIBYTE
-			for (p = pval; *p; p += PQmblen(p, PQclientEncoding(res->conn)))
+			for (p = pval; *p; p += PQmblen(p, res->client_encoding))
 #else
 			for (p = pval; *p; p++)
 #endif
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-int.h,v 1.20 2000/03/11 03:08:37 tgl Exp $
+ * $Id: libpq-int.h,v 1.21 2000/03/14 23:59:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,11 +130,14 @@ struct pg_result
 	 */
 	PGconn	   *xconn;			/* connection we did the query on, if any */
 
-	/* Callback procedure for notice/error message processing
-	 * (copied from originating PGconn).
+	/*
+	 * These fields are copied from the originating PGconn, so that
+	 * operations on the PGresult don't have to reference the PGconn.
 	 */
-	PQnoticeProcessor noticeHook;
+	PQnoticeProcessor noticeHook; /* notice/error message processor */
 	void	   *noticeArg;
+	int			client_encoding; /* encoding id */
+
 
 	char	   *errMsg;			/* error message, or NULL if no error */
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.92 2000/03/11 03:08:36 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.93 2000/03/14 23:59:23 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -153,8 +153,11 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status)`
`153`	`153`
`154`	`154`	`if (conn)`
`155`	`155`	`{`
	`156`	`+ /* copy connection data we might need for operations on PGresult */`
`156`	`157`	`result->noticeHook = conn->noticeHook;`
`157`	`158`	`result->noticeArg = conn->noticeArg;`
	`159`	`+ result->client_encoding = conn->client_encoding;`
	`160`	`+`
`158`	`161`	`/* consider copying conn's errorMessage */`
`159`	`162`	`switch (status)`
`160`	`163`	`{`
`@@ -172,8 +175,10 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status)`
`172`	`175`	`}`
`173`	`176`	`else`
`174`	`177`	`{`
	`178`	`+ /* defaults... */`
`175`	`179`	`result->noticeHook = NULL;`
`176`	`180`	`result->noticeArg = NULL;`
	`181`	`+ result->client_encoding = 0; /* should be SQL_ASCII */`
`177`	`182`	`}`
`178`	`183`
`179`	`184`	`return result;`