Fix encoding conversion function bug.

tatsuo-ishii · tatsuo-ishii · commit 35a0995992ea · 2003-04-12T07:53:57.000Z
See following posting for more details.

Subject: Re: [HACKERS] [BUGS] Bug #943: Server-Encoding from EUC_TW to UTF-8 doesn't
From: Tatsuo Ishii &lt;t-ishii@sra.co.jp&gt;
To: michael.enke@wincor-nixdorf.com, pgsql-bugs@postgresql.org
Cc: pgsql-hackers@postgresql.org
Date: Sat, 12 Apr 2003 10:51:45 +0900 (JST)
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.44 2003/03/10 22:28:18 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.45 2003/04/12 07:53:57 ishii Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -313,7 +313,7 @@ compare1(const void *p1, const void *p2)
 
 	v1 = *(unsigned int *) p1;
 	v2 = ((pg_utf_to_local *) p2)->utf;
-	return (v1 - v2);
+	return (v1 > v2)?1:((v1 == v2)?0:-1);
 }
 
 /*
@@ -328,7 +328,7 @@ compare2(const void *p1, const void *p2)
 
 	v1 = *(unsigned int *) p1;
 	v2 = ((pg_local_to_utf *) p2)->code;
-	return (v1 - v2);
+	return (v1 > v2)?1:((v1 == v2)?0:-1);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.44 2003/03/10 22:28:18 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.45 2003/04/12 07:53:57 ishii Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -313,7 +313,7 @@ compare1(const void p1, const void p2)`
`313`	`313`
`314`	`314`	`v1 = (unsigned int ) p1;`
`315`	`315`	`v2 = ((pg_utf_to_local *) p2)->utf;`
`316`		`- return (v1 - v2);`
	`316`	`+ return (v1 > v2)?1:((v1 == v2)?0:-1);`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`/*`
`@@ -328,7 +328,7 @@ compare2(const void p1, const void p2)`
`328`	`328`
`329`	`329`	`v1 = (unsigned int ) p1;`
`330`	`330`	`v2 = ((pg_local_to_utf *) p2)->code;`
`331`		`- return (v1 - v2);`
	`331`	`+ return (v1 > v2)?1:((v1 == v2)?0:-1);`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`/*`