diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-05-26 15:20:04 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-05-26 15:20:04 +0000 |
| commit | 9c56b408c4758d7d1c457415f3df9b3aa71c3471 (patch) | |
| tree | 5bd811572812c061c2206e285c7e098a52592040 | |
| parent | eeadc5e87f31aae09c6924fc76dab4e1ebd96f4c (diff) | |
| download | postgresql-9c56b408c4758d7d1c457415f3df9b3aa71c3471.tar.gz postgresql-9c56b408c4758d7d1c457415f3df9b3aa71c3471.zip | |
Add fix for 0x7fU constants to pgindent
| -rw-r--r-- | src/backend/utils/mb/big5.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/mb/conv.c | 4 | ||||
| -rw-r--r-- | src/tools/pgindent/indent.bsd.patch | 27 |
3 files changed, 32 insertions, 9 deletions
diff --git a/src/backend/utils/mb/big5.c b/src/backend/utils/mb/big5.c index 4d89dfb6e15..a9eace79a32 100644 --- a/src/backend/utils/mb/big5.c +++ b/src/backend/utils/mb/big5.c @@ -7,7 +7,7 @@ * * 1999/1/15 Tatsuo Ishii * - * $Id: big5.c,v 1.4 1999/05/25 22:42:19 momjian Exp $ + * $Id: big5.c,v 1.5 1999/05/26 15:19:54 momjian Exp $ */ #include "mb/pg_wchar.h" @@ -218,7 +218,7 @@ static unsigned short BinarySearchRange { if (0 == array[mid].peer) return 0; - if (code >= (unsigned) 0xa140) + if (code >= 0xa140U) { /* big5 to cns */ tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8; @@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc) unsigned short cns = 0; int i; - if (big5 < (unsigned) 0xc940) + if (big5 < 0xc940U) { /* level 1 */ @@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc) if (b1c4[i][0] == big5) { *lc = LC_CNS11643_4; - return (b1c4[i][1] | (unsigned) 0x8080); + return (b1c4[i][1] | 0x8080U); } } if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5))) *lc = LC_CNS11643_1; } - else if (big5 == (unsigned) 0xc94a) + else if (big5 == 0xc94aU) { /* level 2 */ *lc = LC_CNS11643_1; diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index 7963b86658b..ea9b78f252e 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -2,7 +2,7 @@ * conversion between client encoding and server internal encoding * (currently mule internal code (mic) is used) * Tatsuo Ishii - * $Id: conv.c,v 1.10 1999/05/25 22:42:20 momjian Exp $ + * $Id: conv.c,v 1.11 1999/05/26 15:19:55 momjian Exp $ */ #include <stdio.h> #include <string.h> @@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len) while (len > 0 && (c1 = *big5++)) { - if (c1 <= (unsigned) 0x7f) + if (c1 <= 0x7fU) { /* ASCII */ len--; *p++ = c1; diff --git a/src/tools/pgindent/indent.bsd.patch b/src/tools/pgindent/indent.bsd.patch index ba5d4756f44..93e35809017 100644 --- a/src/tools/pgindent/indent.bsd.patch +++ b/src/tools/pgindent/indent.bsd.patch @@ -1,6 +1,8 @@ This increases the number of typedef's understood by BSD indent from 100 -to 1000. +to 1000. The second patch allows it to understand 0x7fU constants. + +--------------------------------------------------------------------------- *** ./lexi.c.orig Mon Sep 8 17:55:47 1997 --- ./lexi.c Mon Sep 8 17:02:10 1997 @@ -17,7 +19,28 @@ to 1000. int rwcode; }; -! struct templ specials[1000] = +! struct templ specials[4096] = { "switch", 1, "case", 2, + +*** ./lexi.c.orig Wed May 26 10:50:54 1999 +--- ./lexi.c Wed May 26 10:51:08 1999 +*************** +*** 186,192 **** + *e_token++ = *buf_ptr++; + } + } +! if (*buf_ptr == 'L' || *buf_ptr == 'l') + *e_token++ = *buf_ptr++; + } + else +--- 186,193 ---- + *e_token++ = *buf_ptr++; + } + } +! if (*buf_ptr == 'L' || *buf_ptr == 'U' || +! *buf_ptr == 'l' || *buf_ptr == 'u') + *e_token++ = *buf_ptr++; + } + else |