Commit 1561684a authored by Vadim B. Mikheev's avatar Vadim B. Mikheev

Compare 'char' and 'text' lexicographically.

parent 0346ab71
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.9 1997/05/22 00:07:15 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.10 1997/06/11 05:20:05 vadim Exp $
* *
* NOTES * NOTES
* These functions are stored in pg_amproc. For each operator class * These functions are stored in pg_amproc. For each operator class
...@@ -98,7 +98,7 @@ btabstimecmp(AbsoluteTime a, AbsoluteTime b) ...@@ -98,7 +98,7 @@ btabstimecmp(AbsoluteTime a, AbsoluteTime b)
int32 int32
btcharcmp(char a, char b) btcharcmp(char a, char b)
{ {
return ((int32) (a - b)); return ((int32) ((uint8)a - (uint8)b));
} }
int32 int32
...@@ -135,9 +135,9 @@ int32 ...@@ -135,9 +135,9 @@ int32
bttextcmp(struct varlena *a, struct varlena *b) bttextcmp(struct varlena *a, struct varlena *b)
{ {
int res; int res;
unsigned char *ap, *bp;
#ifdef USE_LOCALE #ifdef USE_LOCALE
unsigned char *ap, *bp;
int la = VARSIZE(a) - VARHDRSZ; int la = VARSIZE(a) - VARHDRSZ;
int lb = VARSIZE(b) - VARHDRSZ; int lb = VARSIZE(b) - VARHDRSZ;
...@@ -155,7 +155,6 @@ bttextcmp(struct varlena *a, struct varlena *b) ...@@ -155,7 +155,6 @@ bttextcmp(struct varlena *a, struct varlena *b)
pfree (bp); pfree (bp);
#else #else
char *ap, *bp;
int len = VARSIZE(a); int len = VARSIZE(a);
/* len is the length of the shorter of the two strings */ /* len is the length of the shorter of the two strings */
...@@ -164,8 +163,8 @@ bttextcmp(struct varlena *a, struct varlena *b) ...@@ -164,8 +163,8 @@ bttextcmp(struct varlena *a, struct varlena *b)
len -= VARHDRSZ; len -= VARHDRSZ;
ap = VARDATA(a); ap = (unsigned char *) VARDATA(a);
bp = VARDATA(b); bp = (unsigned char *) VARDATA(b);
/* /*
* If the two strings differ in the first len bytes, or if they're * If the two strings differ in the first len bytes, or if they're
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment