Commita50f2fd

committed

Repair unintentional damage to MULTIBYTE code.

1 parent34235a2 commita50f2fdCopy full SHA for a50f2fd

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 6 additions & 1 deletion

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`	`returnresult;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* didn't really belong there.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.35 2000/02/07 23:10:11 petere Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.36 2000/03/14 23:59:23 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -347,7 +347,7 @@ do_field(const PQprintOpt po, const PGresult res,`
`347`	`347`	`charch='0';`
`348`	`348`
`349`	`349`	`#ifdefMULTIBYTE`
`350`		`-for (p=pval;*p;p+=PQmblen(p,PQclientEncoding(res->conn)))`
	`350`	`+for (p=pval;*p;p+=PQmblen(p,res->client_encoding))`
`351`	`351`	`#else`
`352`	`352`	`for (p=pval;*p;p++)`
`353`	`353`	`#endif`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $Id: libpq-int.h,v 1.20 2000/03/11 03:08:37 tgl Exp $`
	`15`	`+ * $Id: libpq-int.h,v 1.21 2000/03/14 23:59:23 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -130,11 +130,14 @@ struct pg_result`
`130`	`130`	`*/`
`131`	`131`	`PGconnxconn;/ connection we did the query on, if any */`
`132`	`132`
`133`		`-/* Callback procedure for notice/error message processing`
`134`		`- * (copied from originating PGconn).`
	`133`	`+/*`
	`134`	`+ * These fields are copied from the originating PGconn, so that`
	`135`	`+ * operations on the PGresult don't have to reference the PGconn.`
`135`	`136`	`*/`
`136`		`-PQnoticeProcessornoticeHook;`
	`137`	`+PQnoticeProcessornoticeHook;/* notice/error message processor */`
`137`	`138`	`void*noticeArg;`
	`139`	`+intclient_encoding;/* encoding id */`
	`140`	`+`
`138`	`141`
`139`	`142`	`charerrMsg;/ error message, or NULL if no error */`
`140`	`143`

Comments

(0)