open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suppress signed-vs-unsigned-char warnings.

Browse Source
REL8_1_STABLE
Tom Lane 20 years ago
parent 54a8af058e
commit 8889685555
53 changed files with 503 additions and 515 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      src/backend/catalog/pg_conversion.c
  2. 21
      src/backend/commands/copy.c
  3. 16
      src/backend/libpq/pqcomm.c
  4. 14
      src/backend/libpq/pqformat.c
  5. 5
      src/backend/postmaster/pgstat.c
  6. 6
      src/backend/tcop/fastpath.c
  7. 6
      src/backend/tcop/postgres.c
  8. 10
      src/backend/utils/adt/ascii.c
  9. 74
      src/backend/utils/adt/encode.c
  10. 61
      src/backend/utils/adt/like.c
  11. 10
      src/backend/utils/adt/like_match.c
  12. 30
      src/backend/utils/adt/regexp.c
  13. 59
      src/backend/utils/adt/selfuncs.c
  14. 4
      src/backend/utils/adt/varbit.c
  15. 6
      src/backend/utils/adt/varlena.c
  16. 4
      src/backend/utils/mb/conv.c
  17. 10
      src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
  18. 106
      src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
  19. 10
      src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
  20. 26
      src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
  21. 10
      src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
  22. 30
      src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
  23. 30
      src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
  24. 26
      src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
  25. 10
      src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
  26. 10
      src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
  27. 26
      src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
  28. 10
      src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
  29. 10
      src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
  30. 10
      src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
  31. 10
      src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
  32. 10
      src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
  33. 10
      src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
  34. 10
      src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
  35. 10
      src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
  36. 10
      src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
  37. 10
      src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
  38. 10
      src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
  39. 10
      src/backend/utils/mb/conversion_procs/utf8_and_win1250/utf8_and_win1250.c
  40. 10
      src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c
  41. 10
      src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c
  42. 10
      src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c
  43. 10
      src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c
  44. 70
      src/backend/utils/mb/mbutils.c
  45. 56
      src/backend/utils/mb/wchar.c
  46. 14
      src/bin/pg_dump/pg_backup_custom.c
  47. 26
      src/bin/psql/mbprint.c
  48. 8
      src/bin/psql/mbprint.h
  49. 12
      src/bin/psql/print.c
  50. 28
      src/include/mb/pg_wchar.h
  51. 6
      src/interfaces/libpq/fe-exec.c
  52. 6
      src/interfaces/libpq/fe-misc.c
  53. 6
      src/interfaces/libpq/libpq-fe.h

6
src/backend/catalog/pg_conversion.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.25 2005/07/07 20:39:57 tgl Exp $ * $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.26 2005/09/24 17:53:12 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -291,8 +291,8 @@ pg_convert_using(PG_FUNCTION_ARGS)
Oid convoid; Oid convoid;
HeapTuple tuple; HeapTuple tuple;
Form_pg_conversion body; Form_pg_conversion body;
unsigned char *str; char *str;
unsigned char *result; char *result;
int len; int len;
/* Convert input string to null-terminated form */ /* Convert input string to null-terminated form */

21
src/backend/commands/copy.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.249 2005/09/01 15:34:31 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.250 2005/09/24 17:53:12 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1194,9 +1194,8 @@ CopyTo(CopyState cstate)
* encoding, because it will be sent directly with CopySendString. * encoding, because it will be sent directly with CopySendString.
*/ */
if (cstate->need_transcoding) if (cstate->need_transcoding)
null_print_client = (char *) null_print_client = pg_server_to_client(cstate->null_print,
pg_server_to_client((unsigned char *) cstate->null_print, cstate->null_print_len);
cstate->null_print_len);
/* if a header has been requested send the line */ /* if a header has been requested send the line */
if (cstate->header_line) if (cstate->header_line)
@ -2025,8 +2024,8 @@ CopyReadLine(CopyState cstate)
{ {
char *cvt; char *cvt;
cvt = (char *) pg_client_to_server((unsigned char *) cstate->line_buf.data, cvt = pg_client_to_server(cstate->line_buf.data,
cstate->line_buf.len); cstate->line_buf.len);
if (cvt != cstate->line_buf.data) if (cvt != cstate->line_buf.data)
{ {
/* transfer converted data back to line_buf */ /* transfer converted data back to line_buf */
@ -2057,7 +2056,7 @@ CopyReadLineText(CopyState cstate)
int copy_buf_len; int copy_buf_len;
bool need_data; bool need_data;
bool hit_eof; bool hit_eof;
unsigned char s[2]; char s[2];
s[1] = 0; s[1] = 0;
@ -2331,7 +2330,7 @@ CopyReadLineCSV(CopyState cstate)
int copy_buf_len; int copy_buf_len;
bool need_data; bool need_data;
bool hit_eof; bool hit_eof;
unsigned char s[2]; char s[2];
bool in_quote = false, last_was_esc = false; bool in_quote = false, last_was_esc = false;
char quotec = cstate->quote[0]; char quotec = cstate->quote[0];
char escapec = cstate->escape[0]; char escapec = cstate->escape[0];
@ -3100,8 +3099,7 @@ CopyAttributeOutText(CopyState cstate, char *server_string)
int mblen; int mblen;
if (cstate->need_transcoding) if (cstate->need_transcoding)
string = (char *) pg_server_to_client((unsigned char *) server_string, string = pg_server_to_client(server_string, strlen(server_string));
strlen(server_string));
else else
string = server_string; string = server_string;
@ -3170,8 +3168,7 @@ CopyAttributeOutCSV(CopyState cstate, char *server_string,
use_quote = true; use_quote = true;
if (cstate->need_transcoding) if (cstate->need_transcoding)
string = (char *) pg_server_to_client((unsigned char *) server_string, string = pg_server_to_client(server_string, strlen(server_string));
strlen(server_string));
else else
string = server_string; string = server_string;

16
src/backend/libpq/pqcomm.c
Unescape View File

@ -30,7 +30,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.179 2005/09/12 02:26:31 tgl Exp $ * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.180 2005/09/24 17:53:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -106,11 +106,11 @@ static char sock_path[MAXPGPATH];
#define PQ_BUFFER_SIZE 8192 #define PQ_BUFFER_SIZE 8192
static unsigned char PqSendBuffer[PQ_BUFFER_SIZE]; static char PqSendBuffer[PQ_BUFFER_SIZE];
static int PqSendPointer; /* Next index to store a byte in static int PqSendPointer; /* Next index to store a byte in
* PqSendBuffer */ * PqSendBuffer */
static unsigned char PqRecvBuffer[PQ_BUFFER_SIZE]; static char PqRecvBuffer[PQ_BUFFER_SIZE];
static int PqRecvPointer; /* Next index to read a byte from static int PqRecvPointer; /* Next index to read a byte from
* PqRecvBuffer */ * PqRecvBuffer */
static int PqRecvLength; /* End of data available in PqRecvBuffer */ static int PqRecvLength; /* End of data available in PqRecvBuffer */
@ -482,7 +482,7 @@ Setup_AF_UNIX(void)
elog(WARNING, "configuration item unix_socket_group is not supported on this platform"); elog(WARNING, "configuration item unix_socket_group is not supported on this platform");
#else #else
char *endptr; char *endptr;
unsigned long int val; unsigned long val;
gid_t gid; gid_t gid;
val = strtoul(Unix_socket_group, &endptr, 10); val = strtoul(Unix_socket_group, &endptr, 10);
@ -741,7 +741,7 @@ pq_getbyte(void)
if (pq_recvbuf()) /* If nothing in buffer, then recv some */ if (pq_recvbuf()) /* If nothing in buffer, then recv some */
return EOF; /* Failed to recv data */ return EOF; /* Failed to recv data */
} }
return PqRecvBuffer[PqRecvPointer++]; return (unsigned char) PqRecvBuffer[PqRecvPointer++];
} }
/* -------------------------------- /* --------------------------------
@ -758,7 +758,7 @@ pq_peekbyte(void)
if (pq_recvbuf()) /* If nothing in buffer, then recv some */ if (pq_recvbuf()) /* If nothing in buffer, then recv some */
return EOF; /* Failed to recv data */ return EOF; /* Failed to recv data */
} }
return PqRecvBuffer[PqRecvPointer]; return (unsigned char) PqRecvBuffer[PqRecvPointer];
} }
/* -------------------------------- /* --------------------------------
@ -1029,8 +1029,8 @@ internal_flush(void)
{ {
static int last_reported_send_errno = 0; static int last_reported_send_errno = 0;
unsigned char *bufptr = PqSendBuffer; char *bufptr = PqSendBuffer;
unsigned char *bufend = PqSendBuffer + PqSendPointer; char *bufend = PqSendBuffer + PqSendPointer;
while (bufptr < bufend) while (bufptr < bufend)
{ {

14
src/backend/libpq/pqformat.c
Unescape View File

@ -24,7 +24,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/libpq/pqformat.c,v 1.38 2005/09/24 15:34:07 tgl Exp $ * $PostgreSQL: pgsql/src/backend/libpq/pqformat.c,v 1.39 2005/09/24 17:53:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -137,7 +137,7 @@ pq_sendcountedtext(StringInfo buf, const char *str, int slen,
int extra = countincludesself ? 4 : 0; int extra = countincludesself ? 4 : 0;
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = pg_server_to_client(str, slen);
if (p != str) /* actual conversion has been done? */ if (p != str) /* actual conversion has been done? */
{ {
slen = strlen(p); slen = strlen(p);
@ -167,7 +167,7 @@ pq_sendtext(StringInfo buf, const char *str, int slen)
{ {
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = pg_server_to_client(str, slen);
if (p != str) /* actual conversion has been done? */ if (p != str) /* actual conversion has been done? */
{ {
slen = strlen(p); slen = strlen(p);
@ -192,7 +192,7 @@ pq_sendstring(StringInfo buf, const char *str)
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = pg_server_to_client(str, slen);
if (p != str) /* actual conversion has been done? */ if (p != str) /* actual conversion has been done? */
{ {
slen = strlen(p); slen = strlen(p);
@ -408,7 +408,7 @@ pq_puttextmessage(char msgtype, const char *str)
int slen = strlen(str); int slen = strlen(str);
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = pg_server_to_client(str, slen);
if (p != str) /* actual conversion has been done? */ if (p != str) /* actual conversion has been done? */
{ {
(void) pq_putmessage(msgtype, p, strlen(p) + 1); (void) pq_putmessage(msgtype, p, strlen(p) + 1);
@ -635,7 +635,7 @@ pq_getmsgtext(StringInfo msg, int rawbytes, int *nbytes)
str = &msg->data[msg->cursor]; str = &msg->data[msg->cursor];
msg->cursor += rawbytes; msg->cursor += rawbytes;
p = (char *) pg_client_to_server((unsigned char *) str, rawbytes); p = pg_client_to_server(str, rawbytes);
if (p != str) /* actual conversion has been done? */ if (p != str) /* actual conversion has been done? */
*nbytes = strlen(p); *nbytes = strlen(p);
else else
@ -675,7 +675,7 @@ pq_getmsgstring(StringInfo msg)
errmsg("invalid string in message"))); errmsg("invalid string in message")));
msg->cursor += slen + 1; msg->cursor += slen + 1;
return (const char *) pg_client_to_server((unsigned char *) str, slen); return pg_client_to_server(str, slen);
} }
/* -------------------------------- /* --------------------------------

5
src/backend/postmaster/pgstat.c
Unescape View File

@ -13,7 +13,7 @@
* *
* Copyright (c) 2001-2005, PostgreSQL Global Development Group * Copyright (c) 2001-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.107 2005/08/30 02:47:37 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.108 2005/09/24 17:53:14 tgl Exp $
* ---------- * ----------
*/ */
#include "postgres.h" #include "postgres.h"
@ -788,8 +788,7 @@ pgstat_report_activity(const char *what)
return; return;
len = strlen(what); len = strlen(what);
len = pg_mbcliplen((const unsigned char *) what, len, len = pg_mbcliplen(what, len, PGSTAT_ACTIVITY_SIZE - 1);
PGSTAT_ACTIVITY_SIZE - 1);
memcpy(msg.m_what, what, len); memcpy(msg.m_what, what, len);
msg.m_what[len] = '\0'; msg.m_what[len] = '\0';

6
src/backend/tcop/fastpath.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.81 2005/07/10 21:13:58 tgl Exp $ * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.82 2005/09/24 17:53:15 tgl Exp $
* *
* NOTES * NOTES
* This cruft is the server side of PQfn. * This cruft is the server side of PQfn.
@ -473,9 +473,7 @@ parse_fcall_arguments(StringInfo msgBuf, struct fp_info * fip,
* have to do encoding conversion before calling the typinput * have to do encoding conversion before calling the typinput
* routine, though. * routine, though.
*/ */
pstring = (char *) pstring = pg_client_to_server(abuf.data, argsize);
pg_client_to_server((unsigned char *) abuf.data,
argsize);
fcinfo->arg[i] = fcinfo->arg[i] =
OidFunctionCall3(typinput, OidFunctionCall3(typinput,
CStringGetDatum(pstring), CStringGetDatum(pstring),

6
src/backend/tcop/postgres.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.461 2005/09/22 15:33:36 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.462 2005/09/24 17:53:15 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -1548,9 +1548,7 @@ exec_bind_message(StringInfo input_message)
* We have to do encoding conversion before * We have to do encoding conversion before
* calling the typinput routine. * calling the typinput routine.
*/ */
pstring = (char *) pstring = pg_client_to_server(pbuf.data, plength);
pg_client_to_server((unsigned char *) pbuf.data,
plength);
params[i].value = params[i].value =
OidFunctionCall3(typinput, OidFunctionCall3(typinput,
CStringGetDatum(pstring), CStringGetDatum(pstring),

10
src/backend/utils/adt/ascii.c
Unescape View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/ascii.c,v 1.24 2005/01/01 05:43:07 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/ascii.c,v 1.25 2005/09/24 17:53:15 tgl Exp $
* *
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
@ -42,7 +42,7 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int
/* /*
* ISO-8859-1 <range: 160 -- 255> * ISO-8859-1 <range: 160 -- 255>
*/ */
ascii = " cL Y \"Ca -R 'u ., ?AAAAAAACEEEEIIII NOOOOOxOUUUUYTBaaaaaaaceeeeiiii nooooo/ouuuuyty"; ascii = (const unsigned char *) " cL Y \"Ca -R 'u ., ?AAAAAAACEEEEIIII NOOOOOxOUUUUYTBaaaaaaaceeeeiiii nooooo/ouuuuyty";
range = RANGE_160; range = RANGE_160;
} }
else if (enc == PG_LATIN2) else if (enc == PG_LATIN2)
@ -50,7 +50,7 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int
/* /*
* ISO-8859-2 <range: 160 -- 255> * ISO-8859-2 <range: 160 -- 255>
*/ */
ascii = " A L LS \"SSTZ-ZZ a,l'ls ,sstz\"zzRAAAALCCCEEEEIIDDNNOOOOxRUUUUYTBraaaalccceeeeiiddnnoooo/ruuuuyt."; ascii = (const unsigned char *) " A L LS \"SSTZ-ZZ a,l'ls ,sstz\"zzRAAAALCCCEEEEIIDDNNOOOOxRUUUUYTBraaaalccceeeeiiddnnoooo/ruuuuyt.";
range = RANGE_160; range = RANGE_160;
} }
else if (enc == PG_LATIN9) else if (enc == PG_LATIN9)
@ -58,7 +58,7 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int
/* /*
* ISO-8859-15 <range: 160 -- 255> * ISO-8859-15 <range: 160 -- 255>
*/ */
ascii = " cL YS sCa -R Zu .z EeY?AAAAAAACEEEEIIII NOOOOOxOUUUUYTBaaaaaaaceeeeiiii nooooo/ouuuuyty"; ascii = (const unsigned char *) " cL YS sCa -R Zu .z EeY?AAAAAAACEEEEIIII NOOOOOxOUUUUYTBaaaaaaaceeeeiiii nooooo/ouuuuyty";
range = RANGE_160; range = RANGE_160;
} }
else if (enc == PG_WIN1250) else if (enc == PG_WIN1250)
@ -66,7 +66,7 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int
/* /*
* Window CP1250 <range: 128 -- 255> * Window CP1250 <range: 128 -- 255>
*/ */
ascii = " ' \" %S<STZZ `'\"\".-- s>stzz L A \"CS -RZ ,l'u .,as L\"lzRAAAALCCCEEEEIIDDNNOOOOxRUUUUYTBraaaalccceeeeiiddnnoooo/ruuuuyt "; ascii = (const unsigned char *) " ' \" %S<STZZ `'\"\".-- s>stzz L A \"CS -RZ ,l'u .,as L\"lzRAAAALCCCEEEEIIDDNNOOOOxRUUUUYTBraaaalccceeeeiiddnnoooo/ruuuuyt ";
range = RANGE_128; range = RANGE_128;
} }
else else

74
src/backend/utils/adt/encode.c
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/encode.c,v 1.14 2005/01/01 05:43:07 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/encode.c,v 1.15 2005/09/24 17:53:15 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -20,10 +20,10 @@
struct pg_encoding struct pg_encoding
{ {
unsigned (*encode_len) (const uint8 *data, unsigned dlen); unsigned (*encode_len) (const char *data, unsigned dlen);
unsigned (*decode_len) (const uint8 *data, unsigned dlen); unsigned (*decode_len) (const char *data, unsigned dlen);
unsigned (*encode) (const uint8 *data, unsigned dlen, uint8 *res); unsigned (*encode) (const char *data, unsigned dlen, char *res);
unsigned (*decode) (const uint8 *data, unsigned dlen, uint8 *res); unsigned (*decode) (const char *data, unsigned dlen, char *res);
}; };
static struct pg_encoding *pg_find_encoding(const char *name); static struct pg_encoding *pg_find_encoding(const char *name);
@ -123,9 +123,9 @@ static const int8 hexlookup[128] = {
}; };
static unsigned static unsigned
hex_encode(const uint8 *src, unsigned len, uint8 *dst) hex_encode(const char *src, unsigned len, char *dst)
{ {
const uint8 *end = src + len; const char *end = src + len;
while (src < end) while (src < end)
{ {
@ -136,28 +136,28 @@ hex_encode(const uint8 *src, unsigned len, uint8 *dst)
return len * 2; return len * 2;
} }
static uint8 static char
get_hex(unsigned c) get_hex(char c)
{ {
int res = -1; int res = -1;
if (c > 0 && c < 127) if (c > 0 && c < 127)
res = hexlookup[c]; res = hexlookup[(unsigned char) c];
if (res < 0) if (res < 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid hexadecimal digit: \"%c\"", c))); errmsg("invalid hexadecimal digit: \"%c\"", c)));
return (uint8) res; return (char) res;
} }
static unsigned static unsigned
hex_decode(const uint8 *src, unsigned len, uint8 *dst) hex_decode(const char *src, unsigned len, char *dst)
{ {
const uint8 *s, const char *s,
*srcend; *srcend;
uint8 v1, char v1,
v2, v2,
*p = dst; *p = dst;
@ -185,13 +185,13 @@ hex_decode(const uint8 *src, unsigned len, uint8 *dst)
} }
static unsigned static unsigned
hex_enc_len(const uint8 *src, unsigned srclen) hex_enc_len(const char *src, unsigned srclen)
{ {
return srclen << 1; return srclen << 1;
} }
static unsigned static unsigned
hex_dec_len(const uint8 *src, unsigned srclen) hex_dec_len(const char *src, unsigned srclen)
{ {
return srclen >> 1; return srclen >> 1;
} }
@ -200,7 +200,7 @@ hex_dec_len(const uint8 *src, unsigned srclen)
* BASE64 * BASE64
*/ */
static const unsigned char _base64[] = static const char _base64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static const int8 b64lookup[128] = { static const int8 b64lookup[128] = {
@ -215,11 +215,11 @@ static const int8 b64lookup[128] = {
}; };
static unsigned static unsigned
b64_encode(const uint8 *src, unsigned len, uint8 *dst) b64_encode(const char *src, unsigned len, char *dst)
{ {
uint8 *p, char *p,
*lend = dst + 76; *lend = dst + 76;
const uint8 *s, const char *s,
*end = src + len; *end = src + len;
int pos = 2; int pos = 2;
uint32 buf = 0; uint32 buf = 0;
@ -229,7 +229,7 @@ b64_encode(const uint8 *src, unsigned len, uint8 *dst)
while (s < end) while (s < end)
{ {
buf |= *s << (pos << 3); buf |= (unsigned char) *s << (pos << 3);
pos--; pos--;
s++; s++;
@ -262,12 +262,12 @@ b64_encode(const uint8 *src, unsigned len, uint8 *dst)
} }
static unsigned static unsigned
b64_decode(const uint8 *src, unsigned len, uint8 *dst) b64_decode(const char *src, unsigned len, char *dst)
{ {
const char *srcend = src + len, const char *srcend = src + len,
*s = src; *s = src;
uint8 *p = dst; char *p = dst;
unsigned c; char c;
int b = 0; int b = 0;
uint32 buf = 0; uint32 buf = 0;
int pos = 0, int pos = 0,
@ -300,7 +300,7 @@ b64_decode(const uint8 *src, unsigned len, uint8 *dst)
{ {
b = -1; b = -1;
if (c > 0 && c < 127) if (c > 0 && c < 127)
b = b64lookup[c]; b = b64lookup[(unsigned char) c];
if (b < 0) if (b < 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@ -331,14 +331,14 @@ b64_decode(const uint8 *src, unsigned len, uint8 *dst)
static unsigned static unsigned
b64_enc_len(const uint8 *src, unsigned srclen) b64_enc_len(const char *src, unsigned srclen)
{ {
/* 3 bytes will be converted to 4, linefeed after 76 chars */ /* 3 bytes will be converted to 4, linefeed after 76 chars */
return (srclen + 2) * 4 / 3 + srclen / (76 * 3 / 4); return (srclen + 2) * 4 / 3 + srclen / (76 * 3 / 4);
} }
static unsigned static unsigned
b64_dec_len(const uint8 *src, unsigned srclen) b64_dec_len(const char *src, unsigned srclen)
{ {
return (srclen * 3) >> 2; return (srclen * 3) >> 2;
} }
@ -358,10 +358,10 @@ b64_dec_len(const uint8 *src, unsigned srclen)
#define DIG(VAL) ((VAL) + '0') #define DIG(VAL) ((VAL) + '0')
static unsigned static unsigned
esc_encode(const uint8 *src, unsigned srclen, uint8 *dst) esc_encode(const char *src, unsigned srclen, char *dst)
{ {
const uint8 *end = src + srclen; const char *end = src + srclen;
uint8 *rp = dst; char *rp = dst;
int len = 0; int len = 0;
while (src < end) while (src < end)
@ -395,10 +395,10 @@ esc_encode(const uint8 *src, unsigned srclen, uint8 *dst)
} }
static unsigned static unsigned
esc_decode(const uint8 *src, unsigned srclen, uint8 *dst) esc_decode(const char *src, unsigned srclen, char *dst)
{ {
const uint8 *end = src + srclen; const char *end = src + srclen;
uint8 *rp = dst; char *rp = dst;
int len = 0; int len = 0;
while (src < end) while (src < end)
@ -443,9 +443,9 @@ esc_decode(const uint8 *src, unsigned srclen, uint8 *dst)
} }
static unsigned static unsigned
esc_enc_len(const uint8 *src, unsigned srclen) esc_enc_len(const char *src, unsigned srclen)
{ {
const uint8 *end = src + srclen; const char *end = src + srclen;
int len = 0; int len = 0;
while (src < end) while (src < end)
@ -464,9 +464,9 @@ esc_enc_len(const uint8 *src, unsigned srclen)
} }
static unsigned static unsigned
esc_dec_len(const uint8 *src, unsigned srclen) esc_dec_len(const char *src, unsigned srclen)
{ {
const uint8 *end = src + srclen; const char *end = src + srclen;
int len = 0; int len = 0;
while (src < end) while (src < end)

61
src/backend/utils/adt/like.c
Unescape View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.60 2005/05/25 22:59:33 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.61 2005/09/24 17:53:15 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -28,18 +28,13 @@
#define LIKE_ABORT (-1) #define LIKE_ABORT (-1)
static int MatchText(unsigned char *t, int tlen, static int MatchText(char *t, int tlen, char *p, int plen);
unsigned char *p, int plen); static int MatchTextIC(char *t, int tlen, char *p, int plen);
static int MatchTextIC(unsigned char *t, int tlen, static int MatchBytea(char *t, int tlen, char *p, int plen);
unsigned char *p, int plen);
static int MatchBytea(unsigned char *t, int tlen,
unsigned char *p, int plen);
static text *do_like_escape(text *, text *); static text *do_like_escape(text *, text *);
static int MBMatchText(unsigned char *t, int tlen, static int MBMatchText(char *t, int tlen, char *p, int plen);
unsigned char *p, int plen); static int MBMatchTextIC(char *t, int tlen, char *p, int plen);
static int MBMatchTextIC(unsigned char *t, int tlen,
unsigned char *p, int plen);
static text *MB_do_like_escape(text *, text *); static text *MB_do_like_escape(text *, text *);
/*-------------------- /*--------------------
@ -48,7 +43,7 @@ static text *MB_do_like_escape(text *, text *);
*-------------------- *--------------------
*/ */
static int static int
wchareq(unsigned char *p1, unsigned char *p2) wchareq(char *p1, char *p2)
{ {
int p1_len; int p1_len;
@ -78,9 +73,9 @@ wchareq(unsigned char *p1, unsigned char *p2)
#define CHARMAX 0x80 #define CHARMAX 0x80
static int static int
iwchareq(unsigned char *p1, unsigned char *p2) iwchareq(char *p1, char *p2)
{ {
int c1[2], pg_wchar c1[2],
c2[2]; c2[2];
int l; int l;
@ -88,14 +83,14 @@ iwchareq(unsigned char *p1, unsigned char *p2)
* short cut. if *p1 and *p2 is lower than CHARMAX, then we could * short cut. if *p1 and *p2 is lower than CHARMAX, then we could
* assume they are ASCII * assume they are ASCII
*/ */
if (*p1 < CHARMAX && *p2 < CHARMAX) if ((unsigned char) *p1 < CHARMAX && (unsigned char) *p2 < CHARMAX)
return (tolower(*p1) == tolower(*p2)); return (tolower((unsigned char) *p1) == tolower((unsigned char) *p2));
/* /*
* if one of them is an ASCII while the other is not, then they must * if one of them is an ASCII while the other is not, then they must
* be different characters * be different characters
*/ */
else if (*p1 < CHARMAX || *p2 < CHARMAX) else if ((unsigned char) *p1 < CHARMAX || (unsigned char) *p2 < CHARMAX)
return (0); return (0);
/* /*
@ -103,10 +98,10 @@ iwchareq(unsigned char *p1, unsigned char *p2)
* characters * characters
*/ */
l = pg_mblen(p1); l = pg_mblen(p1);
(void) pg_mb2wchar_with_len(p1, (pg_wchar *) c1, l); (void) pg_mb2wchar_with_len(p1, c1, l);
c1[0] = tolower(c1[0]); c1[0] = tolower(c1[0]);
l = pg_mblen(p2); l = pg_mblen(p2);
(void) pg_mb2wchar_with_len(p2, (pg_wchar *) c2, l); (void) pg_mb2wchar_with_len(p2, c2, l);
c2[0] = tolower(c2[0]); c2[0] = tolower(c2[0]);
return (c1[0] == c2[0]); return (c1[0] == c2[0]);
} }
@ -135,7 +130,7 @@ iwchareq(unsigned char *p1, unsigned char *p2)
#undef do_like_escape #undef do_like_escape
#define CHAREQ(p1, p2) (*(p1) == *(p2)) #define CHAREQ(p1, p2) (*(p1) == *(p2))
#define ICHAREQ(p1, p2) (tolower(*(p1)) == tolower(*(p2))) #define ICHAREQ(p1, p2) (tolower((unsigned char) *(p1)) == tolower((unsigned char) *(p2)))
#define NextChar(p, plen) ((p)++, (plen)--) #define NextChar(p, plen) ((p)++, (plen)--)
#define CopyAdvChar(dst, src, srclen) (*(dst)++ = *(src)++, (srclen)--) #define CopyAdvChar(dst, src, srclen) (*(dst)++ = *(src)++, (srclen)--)
@ -154,7 +149,7 @@ namelike(PG_FUNCTION_ARGS)
Name str = PG_GETARG_NAME(0); Name str = PG_GETARG_NAME(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -178,7 +173,7 @@ namenlike(PG_FUNCTION_ARGS)
Name str = PG_GETARG_NAME(0); Name str = PG_GETARG_NAME(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -202,7 +197,7 @@ textlike(PG_FUNCTION_ARGS)
text *str = PG_GETARG_TEXT_P(0); text *str = PG_GETARG_TEXT_P(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -226,7 +221,7 @@ textnlike(PG_FUNCTION_ARGS)
text *str = PG_GETARG_TEXT_P(0); text *str = PG_GETARG_TEXT_P(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -250,7 +245,7 @@ bytealike(PG_FUNCTION_ARGS)
bytea *str = PG_GETARG_BYTEA_P(0); bytea *str = PG_GETARG_BYTEA_P(0);
bytea *pat = PG_GETARG_BYTEA_P(1); bytea *pat = PG_GETARG_BYTEA_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -271,7 +266,7 @@ byteanlike(PG_FUNCTION_ARGS)
bytea *str = PG_GETARG_BYTEA_P(0); bytea *str = PG_GETARG_BYTEA_P(0);
bytea *pat = PG_GETARG_BYTEA_P(1); bytea *pat = PG_GETARG_BYTEA_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -296,7 +291,7 @@ nameiclike(PG_FUNCTION_ARGS)
Name str = PG_GETARG_NAME(0); Name str = PG_GETARG_NAME(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -320,7 +315,7 @@ nameicnlike(PG_FUNCTION_ARGS)
Name str = PG_GETARG_NAME(0); Name str = PG_GETARG_NAME(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -344,7 +339,7 @@ texticlike(PG_FUNCTION_ARGS)
text *str = PG_GETARG_TEXT_P(0); text *str = PG_GETARG_TEXT_P(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -368,7 +363,7 @@ texticnlike(PG_FUNCTION_ARGS)
text *str = PG_GETARG_TEXT_P(0); text *str = PG_GETARG_TEXT_P(0);
text *pat = PG_GETARG_TEXT_P(1); text *pat = PG_GETARG_TEXT_P(1);
bool result; bool result;
unsigned char *s, char *s,
*p; *p;
int slen, int slen,
plen; plen;
@ -415,7 +410,7 @@ like_escape_bytea(PG_FUNCTION_ARGS)
bytea *pat = PG_GETARG_BYTEA_P(0); bytea *pat = PG_GETARG_BYTEA_P(0);
bytea *esc = PG_GETARG_BYTEA_P(1); bytea *esc = PG_GETARG_BYTEA_P(1);
bytea *result; bytea *result;
unsigned char *p, char *p,
*e, *e,
*r; *r;
int plen, int plen,
@ -500,7 +495,7 @@ like_escape_bytea(PG_FUNCTION_ARGS)
} }
} }
VARATT_SIZEP(result) = r - ((unsigned char *) result); VARATT_SIZEP(result) = r - ((char *) result);
PG_RETURN_BYTEA_P(result); PG_RETURN_BYTEA_P(result);
} }
@ -509,7 +504,7 @@ like_escape_bytea(PG_FUNCTION_ARGS)
* Same as above, but specifically for bytea (binary) datatype * Same as above, but specifically for bytea (binary) datatype
*/ */
static int static int
MatchBytea(unsigned char *t, int tlen, unsigned char *p, int plen) MatchBytea(char *t, int tlen, char *p, int plen)
{ {
/* Fast path for match-everything pattern */ /* Fast path for match-everything pattern */
if ((plen == 1) && (*p == '%')) if ((plen == 1) && (*p == '%'))

10
src/backend/utils/adt/like_match.c
Unescape View File

@ -19,7 +19,7 @@
* Copyright (c) 1996-2005, PostgreSQL Global Development Group * Copyright (c) 1996-2005, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.10 2004/12/31 22:01:22 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.11 2005/09/24 17:53:15 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -71,7 +71,7 @@
*/ */
static int static int
MatchText(unsigned char *t, int tlen, unsigned char *p, int plen) MatchText(char *t, int tlen, char *p, int plen)
{ {
/* Fast path for match-everything pattern */ /* Fast path for match-everything pattern */
if ((plen == 1) && (*p == '%')) if ((plen == 1) && (*p == '%'))
@ -157,7 +157,7 @@ MatchText(unsigned char *t, int tlen, unsigned char *p, int plen)
* Same as above, but ignore case * Same as above, but ignore case
*/ */
static int static int
MatchTextIC(unsigned char *t, int tlen, unsigned char *p, int plen) MatchTextIC(char *t, int tlen, char *p, int plen)
{ {
/* Fast path for match-everything pattern */ /* Fast path for match-everything pattern */
if ((plen == 1) && (*p == '%')) if ((plen == 1) && (*p == '%'))
@ -247,7 +247,7 @@ static text *
do_like_escape(text *pat, text *esc) do_like_escape(text *pat, text *esc)
{ {
text *result; text *result;
unsigned char *p, char *p,
*e, *e,
*r; *r;
int plen, int plen,
@ -332,7 +332,7 @@ do_like_escape(text *pat, text *esc)
} }
} }
VARATT_SIZEP(result) = r - ((unsigned char *) result); VARATT_SIZEP(result) = r - ((char *) result);
return result; return result;
} }

30
src/backend/utils/adt/regexp.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.57 2005/07/10 04:54:30 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.58 2005/09/24 17:53:15 tgl Exp $
* *
* Alistair Crooks added the code for the regex caching * Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance * agc - cached the regular expressions used - there's a good chance
@ -134,7 +134,7 @@ RE_compile_and_cache(text *text_re, int cflags)
/* Convert pattern string to wide characters */ /* Convert pattern string to wide characters */
pattern = (pg_wchar *) palloc((text_re_len - VARHDRSZ + 1) * sizeof(pg_wchar)); pattern = (pg_wchar *) palloc((text_re_len - VARHDRSZ + 1) * sizeof(pg_wchar));
pattern_len = pg_mb2wchar_with_len((unsigned char *) VARDATA(text_re), pattern_len = pg_mb2wchar_with_len(VARDATA(text_re),
pattern, pattern,
text_re_len - VARHDRSZ); text_re_len - VARHDRSZ);
@ -206,7 +206,7 @@ RE_compile_and_cache(text *text_re, int cflags)
* convert to array of pg_wchar which is what Spencer's regex package wants. * convert to array of pg_wchar which is what Spencer's regex package wants.
*/ */
static bool static bool
RE_compile_and_execute(text *text_re, unsigned char *dat, int dat_len, RE_compile_and_execute(text *text_re, char *dat, int dat_len,
int cflags, int nmatch, regmatch_t *pmatch) int cflags, int nmatch, regmatch_t *pmatch)
{ {
pg_wchar *data; pg_wchar *data;
@ -287,7 +287,7 @@ nameregexeq(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
regex_flavor, regex_flavor,
0, NULL)); 0, NULL));
@ -300,7 +300,7 @@ nameregexne(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
regex_flavor, regex_flavor,
0, NULL)); 0, NULL));
@ -313,7 +313,7 @@ textregexeq(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
regex_flavor, regex_flavor,
0, NULL)); 0, NULL));
@ -326,7 +326,7 @@ textregexne(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
regex_flavor, regex_flavor,
0, NULL)); 0, NULL));
@ -346,7 +346,7 @@ nameicregexeq(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
regex_flavor | REG_ICASE, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
@ -359,7 +359,7 @@ nameicregexne(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) NameStr(*n), NameStr(*n),
strlen(NameStr(*n)), strlen(NameStr(*n)),
regex_flavor | REG_ICASE, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
@ -372,7 +372,7 @@ texticregexeq(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(RE_compile_and_execute(p, PG_RETURN_BOOL(RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
regex_flavor | REG_ICASE, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
@ -385,7 +385,7 @@ texticregexne(PG_FUNCTION_ARGS)
text *p = PG_GETARG_TEXT_P(1); text *p = PG_GETARG_TEXT_P(1);
PG_RETURN_BOOL(!RE_compile_and_execute(p, PG_RETURN_BOOL(!RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
regex_flavor | REG_ICASE, regex_flavor | REG_ICASE,
0, NULL)); 0, NULL));
@ -411,7 +411,7 @@ textregexsubstr(PG_FUNCTION_ARGS)
* matched; else return what the whole regexp matched. * matched; else return what the whole regexp matched.
*/ */
match = RE_compile_and_execute(p, match = RE_compile_and_execute(p,
(unsigned char *) VARDATA(s), VARDATA(s),
VARSIZE(s) - VARHDRSZ, VARSIZE(s) - VARHDRSZ,
regex_flavor, regex_flavor,
2, pmatch); 2, pmatch);
@ -524,7 +524,7 @@ similar_escape(PG_FUNCTION_ARGS)
text *pat_text; text *pat_text;
text *esc_text; text *esc_text;
text *result; text *result;
unsigned char *p, char *p,
*e, *e,
*r; *r;
int plen, int plen,
@ -566,7 +566,7 @@ similar_escape(PG_FUNCTION_ARGS)
while (plen > 0) while (plen > 0)
{ {
unsigned char pchar = *p; char pchar = *p;
if (afterescape) if (afterescape)
{ {
@ -604,7 +604,7 @@ similar_escape(PG_FUNCTION_ARGS)
*r++ = '$'; *r++ = '$';
VARATT_SIZEP(result) = r - ((unsigned char *) result); VARATT_SIZEP(result) = r - ((char *) result);
PG_RETURN_TEXT_P(result); PG_RETURN_TEXT_P(result);
} }

59
src/backend/utils/adt/selfuncs.c
Unescape View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.187 2005/07/21 04:41:43 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.188 2005/09/24 17:53:16 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -135,11 +135,11 @@ static bool convert_to_scalar(Datum value, Oid valuetypid, double *scaledvalue,
Datum lobound, Datum hibound, Oid boundstypid, Datum lobound, Datum hibound, Oid boundstypid,
double *scaledlobound, double *scaledhibound); double *scaledlobound, double *scaledhibound);
static double convert_numeric_to_scalar(Datum value, Oid typid); static double convert_numeric_to_scalar(Datum value, Oid typid);
static void convert_string_to_scalar(unsigned char *value, static void convert_string_to_scalar(char *value,
double *scaledvalue, double *scaledvalue,
unsigned char *lobound, char *lobound,
double *scaledlobound, double *scaledlobound,
unsigned char *hibound, char *hibound,
double *scaledhibound); double *scaledhibound);
static void convert_bytea_to_scalar(Datum value, static void convert_bytea_to_scalar(Datum value,
double *scaledvalue, double *scaledvalue,
@ -147,11 +147,11 @@ static void convert_bytea_to_scalar(Datum value,
double *scaledlobound, double *scaledlobound,
Datum hibound, Datum hibound,
double *scaledhibound); double *scaledhibound);
static double convert_one_string_to_scalar(unsigned char *value, static double convert_one_string_to_scalar(char *value,
int rangelo, int rangehi); int rangelo, int rangehi);
static double convert_one_bytea_to_scalar(unsigned char *value, int valuelen, static double convert_one_bytea_to_scalar(unsigned char *value, int valuelen,
int rangelo, int rangehi); int rangelo, int rangehi);
static unsigned char *convert_string_datum(Datum value, Oid typid); static char *convert_string_datum(Datum value, Oid typid);
static double convert_timevalue_to_scalar(Datum value, Oid typid); static double convert_timevalue_to_scalar(Datum value, Oid typid);
static bool get_restriction_variable(PlannerInfo *root, List *args, int varRelid, static bool get_restriction_variable(PlannerInfo *root, List *args, int varRelid,
VariableStatData *vardata, Node **other, VariableStatData *vardata, Node **other,
@ -2350,9 +2350,9 @@ convert_to_scalar(Datum value, Oid valuetypid, double *scaledvalue,
case TEXTOID: case TEXTOID:
case NAMEOID: case NAMEOID:
{ {
unsigned char *valstr = convert_string_datum(value, valuetypid); char *valstr = convert_string_datum(value, valuetypid);
unsigned char *lostr = convert_string_datum(lobound, boundstypid); char *lostr = convert_string_datum(lobound, boundstypid);
unsigned char *histr = convert_string_datum(hibound, boundstypid); char *histr = convert_string_datum(hibound, boundstypid);
convert_string_to_scalar(valstr, scaledvalue, convert_string_to_scalar(valstr, scaledvalue,
lostr, scaledlobound, lostr, scaledlobound,
@ -2471,31 +2471,31 @@ convert_numeric_to_scalar(Datum value, Oid typid)
* so this is more likely to happen than you might think.) * so this is more likely to happen than you might think.)
*/ */
static void static void
convert_string_to_scalar(unsigned char *value, convert_string_to_scalar(char *value,
double *scaledvalue, double *scaledvalue,
unsigned char *lobound, char *lobound,
double *scaledlobound, double *scaledlobound,
unsigned char *hibound, char *hibound,
double *scaledhibound) double *scaledhibound)
{ {
int rangelo, int rangelo,
rangehi; rangehi;
unsigned char *sptr; char *sptr;
rangelo = rangehi = hibound[0]; rangelo = rangehi = (unsigned char) hibound[0];
for (sptr = lobound; *sptr; sptr++) for (sptr = lobound; *sptr; sptr++)
{ {
if (rangelo > *sptr) if (rangelo > (unsigned char) *sptr)
rangelo = *sptr; rangelo = (unsigned char) *sptr;
if (rangehi < *sptr) if (rangehi < (unsigned char) *sptr)
rangehi = *sptr; rangehi = (unsigned char) *sptr;
} }
for (sptr = hibound; *sptr; sptr++) for (sptr = hibound; *sptr; sptr++)
{ {
if (rangelo > *sptr) if (rangelo > (unsigned char) *sptr)
rangelo = *sptr; rangelo = (unsigned char) *sptr;
if (rangehi < *sptr) if (rangehi < (unsigned char) *sptr)
rangehi = *sptr; rangehi = (unsigned char) *sptr;
} }
/* If range includes any upper-case ASCII chars, make it include all */ /* If range includes any upper-case ASCII chars, make it include all */
if (rangelo <= 'Z' && rangehi >= 'A') if (rangelo <= 'Z' && rangehi >= 'A')
@ -2551,9 +2551,9 @@ convert_string_to_scalar(unsigned char *value,
} }
static double static double
convert_one_string_to_scalar(unsigned char *value, int rangelo, int rangehi) convert_one_string_to_scalar(char *value, int rangelo, int rangehi)
{ {
int slen = strlen((char *) value); int slen = strlen(value);
double num, double num,
denom, denom,
base; base;
@ -2574,7 +2574,7 @@ convert_one_string_to_scalar(unsigned char *value, int rangelo, int rangehi)
denom = base; denom = base;
while (slen-- > 0) while (slen-- > 0)
{ {
int ch = *value++; int ch = (unsigned char) *value++;
if (ch < rangelo) if (ch < rangelo)
ch = rangelo - 1; ch = rangelo - 1;
@ -2593,7 +2593,7 @@ convert_one_string_to_scalar(unsigned char *value, int rangelo, int rangehi)
* When using a non-C locale, we must pass the string through strxfrm() * When using a non-C locale, we must pass the string through strxfrm()
* before continuing, so as to generate correct locale-specific results. * before continuing, so as to generate correct locale-specific results.
*/ */
static unsigned char * static char *
convert_string_datum(Datum value, Oid typid) convert_string_datum(Datum value, Oid typid)
{ {
char *val; char *val;
@ -2660,7 +2660,7 @@ convert_string_datum(Datum value, Oid typid)
val = xfrmstr; val = xfrmstr;
} }
return (unsigned char *) val; return val;
} }
/* /*
@ -4104,8 +4104,7 @@ make_greater_string(const Const *str_const)
if (datatype != BYTEAOID) if (datatype != BYTEAOID)
{ {
/* do not generate invalid encoding sequences */ /* do not generate invalid encoding sequences */
if (!pg_verifymbstr((const unsigned char *) workstr, if (!pg_verifymbstr(workstr, len, true))
len, true))
continue; continue;
workstr_const = string_to_const(workstr, datatype); workstr_const = string_to_const(workstr, datatype);
} }
@ -4124,7 +4123,7 @@ make_greater_string(const Const *str_const)
* byte, depending on the character encoding. * byte, depending on the character encoding.
*/ */
if (datatype != BYTEAOID && pg_database_encoding_max_length() > 1) if (datatype != BYTEAOID && pg_database_encoding_max_length() > 1)
len = pg_mbcliplen((const unsigned char *) workstr, len, len - 1); len = pg_mbcliplen(workstr, len, len - 1);
else else
len -= 1; len -= 1;

4
src/backend/utils/adt/varbit.c
Unescape View File

@ -9,7 +9,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.45 2005/07/10 21:13:59 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.46 2005/09/24 17:53:16 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -555,7 +555,7 @@ varbit_send(PG_FUNCTION_ARGS)
pq_begintypsend(&buf); pq_begintypsend(&buf);
pq_sendint(&buf, VARBITLEN(s), sizeof(int32)); pq_sendint(&buf, VARBITLEN(s), sizeof(int32));
pq_sendbytes(&buf, VARBITS(s), VARBITBYTES(s)); pq_sendbytes(&buf, (char *) VARBITS(s), VARBITBYTES(s));
PG_RETURN_BYTEA_P(pq_endtypsend(&buf)); PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
} }

6
src/backend/utils/adt/varlena.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.134 2005/09/16 04:13:17 neilc Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.135 2005/09/24 17:53:16 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -793,10 +793,10 @@ text_position(text *t1, text *t2, int matchnum)
*ps2; *ps2;
ps1 = p1 = (pg_wchar *) palloc((len1 + 1) * sizeof(pg_wchar)); ps1 = p1 = (pg_wchar *) palloc((len1 + 1) * sizeof(pg_wchar));
(void) pg_mb2wchar_with_len((unsigned char *) VARDATA(t1), p1, len1); (void) pg_mb2wchar_with_len(VARDATA(t1), p1, len1);
len1 = pg_wchar_strlen(p1); len1 = pg_wchar_strlen(p1);
ps2 = p2 = (pg_wchar *) palloc((len2 + 1) * sizeof(pg_wchar)); ps2 = p2 = (pg_wchar *) palloc((len2 + 1) * sizeof(pg_wchar));
(void) pg_mb2wchar_with_len((unsigned char *) VARDATA(t2), p2, len2); (void) pg_mb2wchar_with_len(VARDATA(t2), p2, len2);
len2 = pg_wchar_strlen(p2); len2 = pg_wchar_strlen(p2);
/* no use in searching str past point where search_str will fit */ /* no use in searching str past point where search_str will fit */

4
src/backend/utils/mb/conv.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.53 2005/06/15 00:15:08 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.54 2005/09/24 17:53:17 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -421,7 +421,7 @@ LocalToUtf(unsigned char *iso, unsigned char *utf,
continue; continue;
} }
l = pg_encoding_mblen(encoding, iso); l = pg_encoding_mblen(encoding, (char *) iso);
if (l == 1) if (l == 1)
iiso = *iso++; iiso = *iso++;

10
src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c,v 1.9 2004/12/31 22:01:45 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c,v 1.10 2005/09/24 17:53:17 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,8 +35,8 @@ extern Datum mic_to_ascii(PG_FUNCTION_ARGS);
Datum Datum
ascii_to_mic(PG_FUNCTION_ARGS) ascii_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_SQL_ASCII); Assert(PG_GETARG_INT32(0) == PG_SQL_ASCII);
@ -51,8 +51,8 @@ ascii_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_ascii(PG_FUNCTION_ARGS) mic_to_ascii(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);

106
src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c,v 1.10 2005/03/07 04:30:52 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c,v 1.11 2005/09/24 17:53:17 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -82,8 +82,8 @@ static void mic2win866(unsigned char *mic, unsigned char *p, int len);
Datum Datum
koi8r_to_mic(PG_FUNCTION_ARGS) koi8r_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_KOI8R); Assert(PG_GETARG_INT32(0) == PG_KOI8R);
@ -98,8 +98,8 @@ koi8r_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_koi8r(PG_FUNCTION_ARGS) mic_to_koi8r(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -114,8 +114,8 @@ mic_to_koi8r(PG_FUNCTION_ARGS)
Datum Datum
iso_to_mic(PG_FUNCTION_ARGS) iso_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_ISO_8859_5); Assert(PG_GETARG_INT32(0) == PG_ISO_8859_5);
@ -130,8 +130,8 @@ iso_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_iso(PG_FUNCTION_ARGS) mic_to_iso(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -146,8 +146,8 @@ mic_to_iso(PG_FUNCTION_ARGS)
Datum Datum
win1251_to_mic(PG_FUNCTION_ARGS) win1251_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1251); Assert(PG_GETARG_INT32(0) == PG_WIN1251);
@ -162,8 +162,8 @@ win1251_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_win1251(PG_FUNCTION_ARGS) mic_to_win1251(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -178,8 +178,8 @@ mic_to_win1251(PG_FUNCTION_ARGS)
Datum Datum
win866_to_mic(PG_FUNCTION_ARGS) win866_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN866); Assert(PG_GETARG_INT32(0) == PG_WIN866);
@ -194,8 +194,8 @@ win866_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_win866(PG_FUNCTION_ARGS) mic_to_win866(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -210,8 +210,8 @@ mic_to_win866(PG_FUNCTION_ARGS)
Datum Datum
koi8r_to_win1251(PG_FUNCTION_ARGS) koi8r_to_win1251(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -221,7 +221,7 @@ koi8r_to_win1251(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
koi8r2mic(src, buf, len); koi8r2mic(src, buf, len);
mic2win1251(buf, dest, strlen(buf)); mic2win1251(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -230,8 +230,8 @@ koi8r_to_win1251(PG_FUNCTION_ARGS)
Datum Datum
win1251_to_koi8r(PG_FUNCTION_ARGS) win1251_to_koi8r(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -241,7 +241,7 @@ win1251_to_koi8r(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win12512mic(src, buf, len); win12512mic(src, buf, len);
mic2koi8r(buf, dest, strlen(buf)); mic2koi8r(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -250,8 +250,8 @@ win1251_to_koi8r(PG_FUNCTION_ARGS)
Datum Datum
koi8r_to_win866(PG_FUNCTION_ARGS) koi8r_to_win866(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -261,7 +261,7 @@ koi8r_to_win866(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
koi8r2mic(src, buf, len); koi8r2mic(src, buf, len);
mic2win866(buf, dest, strlen(buf)); mic2win866(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -270,8 +270,8 @@ koi8r_to_win866(PG_FUNCTION_ARGS)
Datum Datum
win866_to_koi8r(PG_FUNCTION_ARGS) win866_to_koi8r(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -281,7 +281,7 @@ win866_to_koi8r(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win8662mic(src, buf, len); win8662mic(src, buf, len);
mic2koi8r(buf, dest, strlen(buf)); mic2koi8r(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -290,8 +290,8 @@ win866_to_koi8r(PG_FUNCTION_ARGS)
Datum Datum
win866_to_win1251(PG_FUNCTION_ARGS) win866_to_win1251(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -301,7 +301,7 @@ win866_to_win1251(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win8662mic(src, buf, len); win8662mic(src, buf, len);
mic2win1251(buf, dest, strlen(buf)); mic2win1251(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -310,8 +310,8 @@ win866_to_win1251(PG_FUNCTION_ARGS)
Datum Datum
win1251_to_win866(PG_FUNCTION_ARGS) win1251_to_win866(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -321,7 +321,7 @@ win1251_to_win866(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win12512mic(src, buf, len); win12512mic(src, buf, len);
mic2win866(buf, dest, strlen(buf)); mic2win866(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -330,8 +330,8 @@ win1251_to_win866(PG_FUNCTION_ARGS)
Datum Datum
iso_to_koi8r(PG_FUNCTION_ARGS) iso_to_koi8r(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -341,7 +341,7 @@ iso_to_koi8r(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
iso2mic(src, buf, len); iso2mic(src, buf, len);
mic2koi8r(buf, dest, strlen(buf)); mic2koi8r(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -350,8 +350,8 @@ iso_to_koi8r(PG_FUNCTION_ARGS)
Datum Datum
koi8r_to_iso(PG_FUNCTION_ARGS) koi8r_to_iso(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -361,7 +361,7 @@ koi8r_to_iso(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
koi8r2mic(src, buf, len); koi8r2mic(src, buf, len);
mic2iso(buf, dest, strlen(buf)); mic2iso(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -370,8 +370,8 @@ koi8r_to_iso(PG_FUNCTION_ARGS)
Datum Datum
iso_to_win1251(PG_FUNCTION_ARGS) iso_to_win1251(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -381,7 +381,7 @@ iso_to_win1251(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
iso2mic(src, buf, len); iso2mic(src, buf, len);
mic2win1251(buf, dest, strlen(buf)); mic2win1251(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -390,8 +390,8 @@ iso_to_win1251(PG_FUNCTION_ARGS)
Datum Datum
win1251_to_iso(PG_FUNCTION_ARGS) win1251_to_iso(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -401,7 +401,7 @@ win1251_to_iso(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win12512mic(src, buf, len); win12512mic(src, buf, len);
mic2win1251(buf, dest, strlen(buf)); mic2win1251(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -410,8 +410,8 @@ win1251_to_iso(PG_FUNCTION_ARGS)
Datum Datum
iso_to_win866(PG_FUNCTION_ARGS) iso_to_win866(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -421,7 +421,7 @@ iso_to_win866(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
iso2mic(src, buf, len); iso2mic(src, buf, len);
mic2win866(buf, dest, strlen(buf)); mic2win866(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -430,8 +430,8 @@ iso_to_win866(PG_FUNCTION_ARGS)
Datum Datum
win866_to_iso(PG_FUNCTION_ARGS) win866_to_iso(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -441,7 +441,7 @@ win866_to_iso(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win8662mic(src, buf, len); win8662mic(src, buf, len);
mic2win866(buf, dest, strlen(buf)); mic2win866(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();

10
src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c,v 1.9 2004/12/31 22:01:51 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c,v 1.10 2005/09/24 17:53:18 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,8 +38,8 @@ static void mic2euc_cn(unsigned char *mic, unsigned char *p, int len);
Datum Datum
euc_cn_to_mic(PG_FUNCTION_ARGS) euc_cn_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_CN); Assert(PG_GETARG_INT32(0) == PG_EUC_CN);
@ -54,8 +54,8 @@ euc_cn_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_euc_cn(PG_FUNCTION_ARGS) mic_to_euc_cn(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);

26
src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.11 2005/06/24 13:56:39 ishii Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.12 2005/09/24 17:53:18 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -64,8 +64,8 @@ static void sjis2euc_jp(unsigned char *mic, unsigned char *p, int len);
Datum Datum
euc_jp_to_sjis(PG_FUNCTION_ARGS) euc_jp_to_sjis(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_JP); Assert(PG_GETARG_INT32(0) == PG_EUC_JP);
@ -80,8 +80,8 @@ euc_jp_to_sjis(PG_FUNCTION_ARGS)
Datum Datum
sjis_to_euc_jp(PG_FUNCTION_ARGS) sjis_to_euc_jp(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_SJIS); Assert(PG_GETARG_INT32(0) == PG_SJIS);
@ -96,8 +96,8 @@ sjis_to_euc_jp(PG_FUNCTION_ARGS)
Datum Datum
euc_jp_to_mic(PG_FUNCTION_ARGS) euc_jp_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_JP); Assert(PG_GETARG_INT32(0) == PG_EUC_JP);
@ -112,8 +112,8 @@ euc_jp_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_euc_jp(PG_FUNCTION_ARGS) mic_to_euc_jp(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -128,8 +128,8 @@ mic_to_euc_jp(PG_FUNCTION_ARGS)
Datum Datum
sjis_to_mic(PG_FUNCTION_ARGS) sjis_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_SJIS); Assert(PG_GETARG_INT32(0) == PG_SJIS);
@ -144,8 +144,8 @@ sjis_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_sjis(PG_FUNCTION_ARGS) mic_to_sjis(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);

10
src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c,v 1.9 2004/12/31 22:01:56 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c,v 1.10 2005/09/24 17:53:19 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,8 +38,8 @@ static void mic2euc_kr(unsigned char *mic, unsigned char *p, int len);
Datum Datum
euc_kr_to_mic(PG_FUNCTION_ARGS) euc_kr_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_KR); Assert(PG_GETARG_INT32(0) == PG_EUC_KR);
@ -54,8 +54,8 @@ euc_kr_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_euc_kr(PG_FUNCTION_ARGS) mic_to_euc_kr(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);

30
src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c,v 1.9 2004/12/31 22:02:07 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c,v 1.10 2005/09/24 17:53:19 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -50,8 +50,8 @@ static void mic2euc_tw(unsigned char *mic, unsigned char *p, int len);
Datum Datum
euc_tw_to_big5(PG_FUNCTION_ARGS) euc_tw_to_big5(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -61,7 +61,7 @@ euc_tw_to_big5(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
euc_tw2mic(src, buf, len); euc_tw2mic(src, buf, len);
mic2big5(buf, dest, strlen(buf)); mic2big5(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -70,8 +70,8 @@ euc_tw_to_big5(PG_FUNCTION_ARGS)
Datum Datum
big5_to_euc_tw(PG_FUNCTION_ARGS) big5_to_euc_tw(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -81,7 +81,7 @@ big5_to_euc_tw(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
big52mic(src, buf, len); big52mic(src, buf, len);
mic2euc_tw(buf, dest, strlen(buf)); mic2euc_tw(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -90,8 +90,8 @@ big5_to_euc_tw(PG_FUNCTION_ARGS)
Datum Datum
euc_tw_to_mic(PG_FUNCTION_ARGS) euc_tw_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_TW); Assert(PG_GETARG_INT32(0) == PG_EUC_TW);
@ -106,8 +106,8 @@ euc_tw_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_euc_tw(PG_FUNCTION_ARGS) mic_to_euc_tw(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -122,8 +122,8 @@ mic_to_euc_tw(PG_FUNCTION_ARGS)
Datum Datum
big5_to_mic(PG_FUNCTION_ARGS) big5_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_BIG5); Assert(PG_GETARG_INT32(0) == PG_BIG5);
@ -138,8 +138,8 @@ big5_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_big5(PG_FUNCTION_ARGS) mic_to_big5(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);

30
src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c,v 1.9 2004/12/31 22:02:08 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c,v 1.10 2005/09/24 17:53:19 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -50,8 +50,8 @@ static void mic2win1250(unsigned char *mic, unsigned char *p, int len);
Datum Datum
latin2_to_mic(PG_FUNCTION_ARGS) latin2_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_LATIN2); Assert(PG_GETARG_INT32(0) == PG_LATIN2);
@ -66,8 +66,8 @@ latin2_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_latin2(PG_FUNCTION_ARGS) mic_to_latin2(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -82,8 +82,8 @@ mic_to_latin2(PG_FUNCTION_ARGS)
Datum Datum
win1250_to_mic(PG_FUNCTION_ARGS) win1250_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1250); Assert(PG_GETARG_INT32(0) == PG_WIN1250);
@ -98,8 +98,8 @@ win1250_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_win1250(PG_FUNCTION_ARGS) mic_to_win1250(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -114,8 +114,8 @@ mic_to_win1250(PG_FUNCTION_ARGS)
Datum Datum
latin2_to_win1250(PG_FUNCTION_ARGS) latin2_to_win1250(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -125,7 +125,7 @@ latin2_to_win1250(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
latin22mic(src, buf, len); latin22mic(src, buf, len);
mic2win1250(buf, dest, strlen(buf)); mic2win1250(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();
@ -134,8 +134,8 @@ latin2_to_win1250(PG_FUNCTION_ARGS)
Datum Datum
win1250_to_latin2(PG_FUNCTION_ARGS) win1250_to_latin2(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned char *buf; unsigned char *buf;
@ -145,7 +145,7 @@ win1250_to_latin2(PG_FUNCTION_ARGS)
buf = palloc(len * ENCODING_GROWTH_RATE); buf = palloc(len * ENCODING_GROWTH_RATE);
win12502mic(src, buf, len); win12502mic(src, buf, len);
mic2latin2(buf, dest, strlen(buf)); mic2latin2(buf, dest, strlen((char *) buf));
pfree(buf); pfree(buf);
PG_RETURN_VOID(); PG_RETURN_VOID();

26
src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c,v 1.9 2004/12/31 22:02:10 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c,v 1.10 2005/09/24 17:53:19 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -50,8 +50,8 @@ static void mic2latin4(unsigned char *mic, unsigned char *p, int len);
Datum Datum
latin1_to_mic(PG_FUNCTION_ARGS) latin1_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_LATIN1); Assert(PG_GETARG_INT32(0) == PG_LATIN1);
@ -66,8 +66,8 @@ latin1_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_latin1(PG_FUNCTION_ARGS) mic_to_latin1(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -82,8 +82,8 @@ mic_to_latin1(PG_FUNCTION_ARGS)
Datum Datum
latin3_to_mic(PG_FUNCTION_ARGS) latin3_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_LATIN3); Assert(PG_GETARG_INT32(0) == PG_LATIN3);
@ -98,8 +98,8 @@ latin3_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_latin3(PG_FUNCTION_ARGS) mic_to_latin3(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);
@ -114,8 +114,8 @@ mic_to_latin3(PG_FUNCTION_ARGS)
Datum Datum
latin4_to_mic(PG_FUNCTION_ARGS) latin4_to_mic(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_LATIN4); Assert(PG_GETARG_INT32(0) == PG_LATIN4);
@ -130,8 +130,8 @@ latin4_to_mic(PG_FUNCTION_ARGS)
Datum Datum
mic_to_latin4(PG_FUNCTION_ARGS) mic_to_latin4(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL); Assert(PG_GETARG_INT32(0) == PG_MULE_INTERNAL);

10
src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c,v 1.10 2005/03/07 04:30:52 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c,v 1.11 2005/09/24 17:53:20 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,8 +35,8 @@ extern Datum utf8_to_ascii(PG_FUNCTION_ARGS);
Datum Datum
ascii_to_utf8(PG_FUNCTION_ARGS) ascii_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_SQL_ASCII); Assert(PG_GETARG_INT32(0) == PG_SQL_ASCII);
@ -51,8 +51,8 @@ ascii_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_ascii(PG_FUNCTION_ARGS) utf8_to_ascii(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c,v 1.11 2005/09/24 17:53:20 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_big5(PG_FUNCTION_ARGS);
Datum Datum
big5_to_utf8(PG_FUNCTION_ARGS) big5_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_BIG5); Assert(PG_GETARG_INT32(0) == PG_BIG5);
@ -53,8 +53,8 @@ big5_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_big5(PG_FUNCTION_ARGS) utf8_to_big5(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

26
src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.11 2005/09/24 17:53:20 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -49,8 +49,8 @@ extern Datum win866_to_utf8(PG_FUNCTION_ARGS);
Datum Datum
utf8_to_koi8r(PG_FUNCTION_ARGS) utf8_to_koi8r(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -66,8 +66,8 @@ utf8_to_koi8r(PG_FUNCTION_ARGS)
Datum Datum
koi8r_to_utf8(PG_FUNCTION_ARGS) koi8r_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_KOI8R); Assert(PG_GETARG_INT32(0) == PG_KOI8R);
@ -83,8 +83,8 @@ koi8r_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_win1251(PG_FUNCTION_ARGS) utf8_to_win1251(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -100,8 +100,8 @@ utf8_to_win1251(PG_FUNCTION_ARGS)
Datum Datum
win1251_to_utf8(PG_FUNCTION_ARGS) win1251_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1251); Assert(PG_GETARG_INT32(0) == PG_WIN1251);
@ -117,8 +117,8 @@ win1251_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_win866(PG_FUNCTION_ARGS) utf8_to_win866(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -134,8 +134,8 @@ utf8_to_win866(PG_FUNCTION_ARGS)
Datum Datum
win866_to_utf8(PG_FUNCTION_ARGS) win866_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN866); Assert(PG_GETARG_INT32(0) == PG_WIN866);

10
src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c,v 1.11 2005/09/24 17:53:21 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_euc_cn(PG_FUNCTION_ARGS);
Datum Datum
euc_cn_to_utf8(PG_FUNCTION_ARGS) euc_cn_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_CN); Assert(PG_GETARG_INT32(0) == PG_EUC_CN);
@ -53,8 +53,8 @@ euc_cn_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_euc_cn(PG_FUNCTION_ARGS) utf8_to_euc_cn(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c,v 1.11 2005/09/24 17:53:21 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_euc_jp(PG_FUNCTION_ARGS);
Datum Datum
euc_jp_to_utf8(PG_FUNCTION_ARGS) euc_jp_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_JP); Assert(PG_GETARG_INT32(0) == PG_EUC_JP);
@ -53,8 +53,8 @@ euc_jp_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_euc_jp(PG_FUNCTION_ARGS) utf8_to_euc_jp(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c,v 1.11 2005/09/24 17:53:22 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_euc_kr(PG_FUNCTION_ARGS);
Datum Datum
euc_kr_to_utf8(PG_FUNCTION_ARGS) euc_kr_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_KR); Assert(PG_GETARG_INT32(0) == PG_EUC_KR);
@ -53,8 +53,8 @@ euc_kr_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_euc_kr(PG_FUNCTION_ARGS) utf8_to_euc_kr(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c,v 1.11 2005/09/24 17:53:22 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_euc_tw(PG_FUNCTION_ARGS);
Datum Datum
euc_tw_to_utf8(PG_FUNCTION_ARGS) euc_tw_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_EUC_TW); Assert(PG_GETARG_INT32(0) == PG_EUC_TW);
@ -53,8 +53,8 @@ euc_tw_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_euc_tw(PG_FUNCTION_ARGS) utf8_to_euc_tw(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c,v 1.11 2005/09/24 17:53:23 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_gb18030(PG_FUNCTION_ARGS);
Datum Datum
gb18030_to_utf8(PG_FUNCTION_ARGS) gb18030_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_GB18030); Assert(PG_GETARG_INT32(0) == PG_GB18030);
@ -53,8 +53,8 @@ gb18030_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_gb18030(PG_FUNCTION_ARGS) utf8_to_gb18030(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c,v 1.10 2005/03/07 04:30:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c,v 1.11 2005/09/24 17:53:23 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_gbk(PG_FUNCTION_ARGS);
Datum Datum
gbk_to_utf8(PG_FUNCTION_ARGS) gbk_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_GBK); Assert(PG_GETARG_INT32(0) == PG_GBK);
@ -53,8 +53,8 @@ gbk_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_gbk(PG_FUNCTION_ARGS) utf8_to_gbk(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.13 2005/03/14 18:31:21 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.14 2005/09/24 17:53:23 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -128,8 +128,8 @@ Datum
iso8859_to_utf8(PG_FUNCTION_ARGS) iso8859_to_utf8(PG_FUNCTION_ARGS)
{ {
int encoding = PG_GETARG_INT32(0); int encoding = PG_GETARG_INT32(0);
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(1) == PG_UTF8); Assert(PG_GETARG_INT32(1) == PG_UTF8);
@ -144,8 +144,8 @@ Datum
utf8_to_iso8859(PG_FUNCTION_ARGS) utf8_to_iso8859(PG_FUNCTION_ARGS)
{ {
int encoding = PG_GETARG_INT32(1); int encoding = PG_GETARG_INT32(1);
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.11 2005/03/07 04:30:54 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.12 2005/09/24 17:53:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,8 +35,8 @@ extern Datum utf8_to_iso8859_1(PG_FUNCTION_ARGS);
Datum Datum
iso8859_1_to_utf8(PG_FUNCTION_ARGS) iso8859_1_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned short c; unsigned short c;
@ -62,8 +62,8 @@ iso8859_1_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_iso8859_1(PG_FUNCTION_ARGS) utf8_to_iso8859_1(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
unsigned short c, unsigned short c,
c1, c1,

10
src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c,v 1.10 2005/03/07 04:30:54 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c,v 1.11 2005/09/24 17:53:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_johab(PG_FUNCTION_ARGS);
Datum Datum
johab_to_utf8(PG_FUNCTION_ARGS) johab_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_JOHAB); Assert(PG_GETARG_INT32(0) == PG_JOHAB);
@ -53,8 +53,8 @@ johab_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_johab(PG_FUNCTION_ARGS) utf8_to_johab(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c,v 1.10 2005/03/07 04:30:54 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c,v 1.11 2005/09/24 17:53:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_sjis(PG_FUNCTION_ARGS);
Datum Datum
sjis_to_utf8(PG_FUNCTION_ARGS) sjis_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_SJIS); Assert(PG_GETARG_INT32(0) == PG_SJIS);
@ -53,8 +53,8 @@ sjis_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_sjis(PG_FUNCTION_ARGS) utf8_to_sjis(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c,v 1.10 2005/03/07 04:30:54 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c,v 1.11 2005/09/24 17:53:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_uhc(PG_FUNCTION_ARGS);
Datum Datum
uhc_to_utf8(PG_FUNCTION_ARGS) uhc_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UHC); Assert(PG_GETARG_INT32(0) == PG_UHC);
@ -53,8 +53,8 @@ uhc_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_uhc(PG_FUNCTION_ARGS) utf8_to_uhc(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_win1250/utf8_and_win1250.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1250/utf8_and_win1250.c,v 1.11 2005/03/14 18:31:21 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1250/utf8_and_win1250.c,v 1.12 2005/09/24 17:53:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,8 +37,8 @@ extern Datum win1250_to_utf8(PG_FUNCTION_ARGS);
Datum Datum
utf8_to_win1250(PG_FUNCTION_ARGS) utf8_to_win1250(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -54,8 +54,8 @@ utf8_to_win1250(PG_FUNCTION_ARGS)
Datum Datum
win1250_to_utf8(PG_FUNCTION_ARGS) win1250_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1250); Assert(PG_GETARG_INT32(0) == PG_WIN1250);

10
src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c,v 1.3 2005/03/14 18:31:22 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c,v 1.4 2005/09/24 17:53:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,8 +37,8 @@ extern Datum win1252_to_utf8(PG_FUNCTION_ARGS);
Datum Datum
utf8_to_win1252(PG_FUNCTION_ARGS) utf8_to_win1252(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -54,8 +54,8 @@ utf8_to_win1252(PG_FUNCTION_ARGS)
Datum Datum
win1252_to_utf8(PG_FUNCTION_ARGS) win1252_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1252); Assert(PG_GETARG_INT32(0) == PG_WIN1252);

10
src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c,v 1.11 2005/03/14 18:31:22 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c,v 1.12 2005/09/24 17:53:26 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,8 +37,8 @@ extern Datum win1256_to_utf8(PG_FUNCTION_ARGS);
Datum Datum
utf8_to_win1256(PG_FUNCTION_ARGS) utf8_to_win1256(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -54,8 +54,8 @@ utf8_to_win1256(PG_FUNCTION_ARGS)
Datum Datum
win1256_to_utf8(PG_FUNCTION_ARGS) win1256_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1256); Assert(PG_GETARG_INT32(0) == PG_WIN1256);

10
src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c,v 1.1 2005/03/07 04:30:55 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c,v 1.2 2005/09/24 17:53:26 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,8 +36,8 @@ extern Datum utf8_to_win1258(PG_FUNCTION_ARGS);
Datum Datum
win1258_to_utf8(PG_FUNCTION_ARGS) win1258_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN1258); Assert(PG_GETARG_INT32(0) == PG_WIN1258);
@ -53,8 +53,8 @@ win1258_to_utf8(PG_FUNCTION_ARGS)
Datum Datum
utf8_to_win1258(PG_FUNCTION_ARGS) utf8_to_win1258(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);

10
src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c,v 1.11 2005/03/14 18:31:22 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c,v 1.12 2005/09/24 17:53:26 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,8 +37,8 @@ extern Datum win874_to_utf8(PG_FUNCTION_ARGS);
Datum Datum
utf8_to_win874(PG_FUNCTION_ARGS) utf8_to_win874(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_UTF8); Assert(PG_GETARG_INT32(0) == PG_UTF8);
@ -54,8 +54,8 @@ utf8_to_win874(PG_FUNCTION_ARGS)
Datum Datum
win874_to_utf8(PG_FUNCTION_ARGS) win874_to_utf8(PG_FUNCTION_ARGS)
{ {
unsigned char *src = PG_GETARG_CSTRING(2); unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
unsigned char *dest = PG_GETARG_CSTRING(3); unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
int len = PG_GETARG_INT32(4); int len = PG_GETARG_INT32(4);
Assert(PG_GETARG_INT32(0) == PG_WIN874); Assert(PG_GETARG_INT32(0) == PG_WIN874);

70
src/backend/utils/mb/mbutils.c
Unescape View File

@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used) * (currently mule internal code (mic) is used)
* Tatsuo Ishii * Tatsuo Ishii
* *
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.50 2005/07/10 21:13:59 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.51 2005/09/24 17:53:17 tgl Exp $
*/ */
#include "postgres.h" #include "postgres.h"
@ -43,9 +43,9 @@ static int pending_client_encoding = PG_SQL_ASCII;
/* Internal functions */ /* Internal functions */
static unsigned char *perform_default_encoding_conversion(unsigned char *src, static char *perform_default_encoding_conversion(const char *src,
int len, bool is_client_to_server); int len, bool is_client_to_server);
static int cliplen(const unsigned char *str, int len, int limit); static int cliplen(const char *str, int len, int limit);
/* /*
@ -303,7 +303,7 @@ pg_convert(PG_FUNCTION_ARGS)
} }
/* /*
* Convert string using encoding_nanme. * Convert string using encoding_name.
* *
* TEXT convert2(TEXT string, NAME src_encoding_name, NAME dest_encoding_name) * TEXT convert2(TEXT string, NAME src_encoding_name, NAME dest_encoding_name)
*/ */
@ -346,7 +346,7 @@ pg_convert2(PG_FUNCTION_ARGS)
* textin assumes that input string encoding is same as database * textin assumes that input string encoding is same as database
* encoding. * encoding.
*/ */
len = strlen(result) + VARHDRSZ; len = strlen((char *) result) + VARHDRSZ;
retval = palloc(len); retval = palloc(len);
VARATT_SIZEP(retval) = len; VARATT_SIZEP(retval) = len;
memcpy(VARDATA(retval), result, len - VARHDRSZ); memcpy(VARDATA(retval), result, len - VARHDRSZ);
@ -364,14 +364,14 @@ pg_convert2(PG_FUNCTION_ARGS)
/* /*
* convert client encoding to server encoding. * convert client encoding to server encoding.
*/ */
unsigned char * char *
pg_client_to_server(unsigned char *s, int len) pg_client_to_server(const char *s, int len)
{ {
Assert(DatabaseEncoding); Assert(DatabaseEncoding);
Assert(ClientEncoding); Assert(ClientEncoding);
if (ClientEncoding->encoding == DatabaseEncoding->encoding) if (ClientEncoding->encoding == DatabaseEncoding->encoding)
return s; return (char *) s;
return perform_default_encoding_conversion(s, len, true); return perform_default_encoding_conversion(s, len, true);
} }
@ -379,14 +379,14 @@ pg_client_to_server(unsigned char *s, int len)
/* /*
* convert server encoding to client encoding. * convert server encoding to client encoding.
*/ */
unsigned char * char *
pg_server_to_client(unsigned char *s, int len) pg_server_to_client(const char *s, int len)
{ {
Assert(DatabaseEncoding); Assert(DatabaseEncoding);
Assert(ClientEncoding); Assert(ClientEncoding);
if (ClientEncoding->encoding == DatabaseEncoding->encoding) if (ClientEncoding->encoding == DatabaseEncoding->encoding)
return s; return (char *) s;
return perform_default_encoding_conversion(s, len, false); return perform_default_encoding_conversion(s, len, false);
} }
@ -398,16 +398,16 @@ pg_server_to_client(unsigned char *s, int len)
* before calling this function. Otherwise no conversion is * before calling this function. Otherwise no conversion is
* performed. * performed.
*/ */
static unsigned char * static char *
perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_to_server) perform_default_encoding_conversion(const char *src, int len, bool is_client_to_server)
{ {
unsigned char *result; char *result;
int src_encoding, int src_encoding,
dest_encoding; dest_encoding;
FmgrInfo *flinfo; FmgrInfo *flinfo;
if (len <= 0) if (len <= 0)
return src; return (char *) src;
if (is_client_to_server) if (is_client_to_server)
{ {
@ -423,13 +423,13 @@ perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_
} }
if (flinfo == NULL) if (flinfo == NULL)
return src; return (char *) src;
if (src_encoding == dest_encoding) if (src_encoding == dest_encoding)
return src; return (char *) src;
if (src_encoding == PG_SQL_ASCII || dest_encoding == PG_SQL_ASCII) if (src_encoding == PG_SQL_ASCII || dest_encoding == PG_SQL_ASCII)
return src; return (char *) src;
result = palloc(len * 4 + 1); result = palloc(len * 4 + 1);
@ -444,41 +444,41 @@ perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_
/* convert a multibyte string to a wchar */ /* convert a multibyte string to a wchar */
int int
pg_mb2wchar(const unsigned char *from, pg_wchar *to) pg_mb2wchar(const char *from, pg_wchar *to)
{ {
return (*pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len) (from, to, strlen(from)); return (*pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len) ((const unsigned char *) from, to, strlen(from));
} }
/* convert a multibyte string to a wchar with a limited length */ /* convert a multibyte string to a wchar with a limited length */
int int
pg_mb2wchar_with_len(const unsigned char *from, pg_wchar *to, int len) pg_mb2wchar_with_len(const char *from, pg_wchar *to, int len)
{ {
return (*pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len) (from, to, len); return (*pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len) ((const unsigned char *) from, to, len);
} }
/* returns the byte length of a multibyte word */ /* returns the byte length of a multibyte word */
int int
pg_mblen(const unsigned char *mbstr) pg_mblen(const char *mbstr)
{ {
return ((*pg_wchar_table[DatabaseEncoding->encoding].mblen) (mbstr)); return ((*pg_wchar_table[DatabaseEncoding->encoding].mblen) ((const unsigned char *) mbstr));
} }
/* returns the display length of a multibyte word */ /* returns the display length of a multibyte word */
int int
pg_dsplen(const unsigned char *mbstr) pg_dsplen(const char *mbstr)
{ {
return ((*pg_wchar_table[DatabaseEncoding->encoding].dsplen) (mbstr)); return ((*pg_wchar_table[DatabaseEncoding->encoding].dsplen) ((const unsigned char *) mbstr));
} }
/* returns the length (counted as a wchar) of a multibyte string */ /* returns the length (counted in wchars) of a multibyte string */
int int
pg_mbstrlen(const unsigned char *mbstr) pg_mbstrlen(const char *mbstr)
{ {
int len = 0; int len = 0;
/* optimization for single byte encoding */ /* optimization for single byte encoding */
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
return strlen((char *) mbstr); return strlen(mbstr);
while (*mbstr) while (*mbstr)
{ {
@ -488,11 +488,11 @@ pg_mbstrlen(const unsigned char *mbstr)
return (len); return (len);
} }
/* returns the length (counted as a wchar) of a multibyte string /* returns the length (counted in wchars) of a multibyte string
* (not necessarily NULL terminated) * (not necessarily NULL terminated)
*/ */
int int
pg_mbstrlen_with_len(const unsigned char *mbstr, int limit) pg_mbstrlen_with_len(const char *mbstr, int limit)
{ {
int len = 0; int len = 0;
@ -518,7 +518,7 @@ pg_mbstrlen_with_len(const unsigned char *mbstr, int limit)
* this function does not break multibyte word boundary. * this function does not break multibyte word boundary.
*/ */
int int
pg_mbcliplen(const unsigned char *mbstr, int len, int limit) pg_mbcliplen(const char *mbstr, int len, int limit)
{ {
int clen = 0; int clen = 0;
int l; int l;
@ -545,7 +545,7 @@ pg_mbcliplen(const unsigned char *mbstr, int len, int limit)
* Similar to pg_mbcliplen except the limit parameter specifies the * Similar to pg_mbcliplen except the limit parameter specifies the
* character length, not the byte length. */ * character length, not the byte length. */
int int
pg_mbcharcliplen(const unsigned char *mbstr, int len, int limit) pg_mbcharcliplen(const char *mbstr, int len, int limit)
{ {
int clen = 0; int clen = 0;
int nch = 0; int nch = 0;
@ -613,10 +613,10 @@ pg_client_encoding(PG_FUNCTION_ARGS)
} }
static int static int
cliplen(const unsigned char *str, int len, int limit) cliplen(const char *str, int len, int limit)
{ {
int l = 0; int l = 0;
const unsigned char *s; const char *s;
for (s = str; *s; s++, l++) for (s = str; *s; s++, l++)
{ {

56
src/backend/utils/mb/wchar.c
Unescape View File

@ -1,7 +1,7 @@
/* /*
* conversion functions between pg_wchar and multibyte streams. * conversion functions between pg_wchar and multibyte streams.
* Tatsuo Ishii * Tatsuo Ishii
* $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.44 2005/06/15 00:15:08 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.45 2005/09/24 17:53:17 tgl Exp $
* *
* WIN1250 client encoding updated by Pavel Behal * WIN1250 client encoding updated by Pavel Behal
* *
@ -769,28 +769,28 @@ pg_mic_mblen(const unsigned char *mbstr)
* Returns the byte length of a multibyte word. * Returns the byte length of a multibyte word.
*/ */
int int
pg_encoding_mblen(int encoding, const unsigned char *mbstr) pg_encoding_mblen(int encoding, const char *mbstr)
{ {
Assert(PG_VALID_ENCODING(encoding)); Assert(PG_VALID_ENCODING(encoding));
return ((encoding >= 0 && return ((encoding >= 0 &&
encoding < sizeof(pg_wchar_table) / sizeof(pg_wchar_tbl)) ? encoding < sizeof(pg_wchar_table) / sizeof(pg_wchar_tbl)) ?
((*pg_wchar_table[encoding].mblen) (mbstr)) : ((*pg_wchar_table[encoding].mblen) ((const unsigned char *) mbstr)) :
((*pg_wchar_table[PG_SQL_ASCII].mblen) (mbstr))); ((*pg_wchar_table[PG_SQL_ASCII].mblen) ((const unsigned char *) mbstr)));
} }
/* /*
* Returns the display length of a multibyte word. * Returns the display length of a multibyte word.
*/ */
int int
pg_encoding_dsplen(int encoding, const unsigned char *mbstr) pg_encoding_dsplen(int encoding, const char *mbstr)
{ {
Assert(PG_VALID_ENCODING(encoding)); Assert(PG_VALID_ENCODING(encoding));
return ((encoding >= 0 && return ((encoding >= 0 &&
encoding < sizeof(pg_wchar_table) / sizeof(pg_wchar_tbl)) ? encoding < sizeof(pg_wchar_table) / sizeof(pg_wchar_tbl)) ?
((*pg_wchar_table[encoding].dsplen) (mbstr)) : ((*pg_wchar_table[encoding].dsplen) ((const unsigned char *) mbstr)) :
((*pg_wchar_table[PG_SQL_ASCII].dsplen) (mbstr))); ((*pg_wchar_table[PG_SQL_ASCII].dsplen) ((const unsigned char *) mbstr)));
} }
/* /*
@ -840,7 +840,7 @@ bool pg_utf8_islegal(const unsigned char *source, int length) {
* true; when noError is false, ereport() a descriptive message. * true; when noError is false, ereport() a descriptive message.
*/ */
bool bool
pg_verifymbstr(const unsigned char *mbstr, int len, bool noError) pg_verifymbstr(const char *mbstr, int len, bool noError)
{ {
int l; int l;
int i; int i;
@ -857,24 +857,30 @@ pg_verifymbstr(const unsigned char *mbstr, int len, bool noError)
l = pg_mblen(mbstr); l = pg_mblen(mbstr);
/* special UTF-8 check */ /* special UTF-8 check */
if (encoding == PG_UTF8) { if (encoding == PG_UTF8)
if(!pg_utf8_islegal(mbstr,l)) { {
if (noError) return false; if(!pg_utf8_islegal((const unsigned char *) mbstr, l))
ereport(ERROR,(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),errmsg("Invalid UNICODE byte sequence detected near byte %c",*mbstr))); {
if (noError)
return false;
ereport(ERROR,
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
errmsg("invalid UNICODE byte sequence detected near byte 0x%02x",
(unsigned char) *mbstr)));
} }
} else { } else {
for (i = 1; i < l; i++) for (i = 1; i < l; i++)
{ {
/* /*
* we expect that every multibyte char consists of bytes * we expect that every multibyte char consists of bytes
* having the 8th bit set * having the 8th bit set
*/ */
if (i >= len || (mbstr[i] & 0x80) == 0) if (i >= len || (mbstr[i] & 0x80) == 0)
{ {
char buf[8 * 2 + 1]; char buf[8 * 2 + 1];
char *p = buf; char *p = buf;
int j, int j,
jlimit; jlimit;
if (noError) if (noError)
return false; return false;
@ -883,12 +889,12 @@ pg_verifymbstr(const unsigned char *mbstr, int len, bool noError)
jlimit = Min(jlimit, 8); /* prevent buffer overrun */ jlimit = Min(jlimit, 8); /* prevent buffer overrun */
for (j = 0; j < jlimit; j++) for (j = 0; j < jlimit; j++)
p += sprintf(p, "%02x", mbstr[j]); p += sprintf(p, "%02x", (unsigned char) mbstr[j]);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE), (errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
errmsg("invalid byte sequence for encoding \"%s\": 0x%s", errmsg("invalid byte sequence for encoding \"%s\": 0x%s",
GetDatabaseEncodingName(), buf))); GetDatabaseEncodingName(), buf)));
} }
} }
} }

14
src/bin/pg_dump/pg_backup_custom.c
Unescape View File

@ -19,7 +19,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.31 2005/06/21 20:45:44 tgl Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.32 2005/09/24 17:53:27 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,8 +27,6 @@
#include "pg_backup.h" #include "pg_backup.h"
#include "pg_backup_archiver.h" #include "pg_backup_archiver.h"
#include <errno.h>
/*-------- /*--------
* Routines in the format interface * Routines in the format interface
*-------- *--------
@ -548,7 +546,7 @@ _PrintData(ArchiveHandle *AH)
ctx->filePos += blkLen; ctx->filePos += blkLen;
zp->next_in = in; zp->next_in = (void *) in;
zp->avail_in = blkLen; zp->avail_in = blkLen;
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
@ -557,7 +555,7 @@ _PrintData(ArchiveHandle *AH)
{ {
while (zp->avail_in != 0) while (zp->avail_in != 0)
{ {
zp->next_out = out; zp->next_out = (void *) out;
zp->avail_out = zlibOutSize; zp->avail_out = zlibOutSize;
res = inflate(zp, 0); res = inflate(zp, 0);
if (res != Z_OK && res != Z_STREAM_END) if (res != Z_OK && res != Z_STREAM_END)
@ -587,7 +585,7 @@ _PrintData(ArchiveHandle *AH)
zp->avail_in = 0; zp->avail_in = 0;
while (res != Z_STREAM_END) while (res != Z_STREAM_END)
{ {
zp->next_out = out; zp->next_out = (void *) out;
zp->avail_out = zlibOutSize; zp->avail_out = zlibOutSize;
res = inflate(zp, 0); res = inflate(zp, 0);
if (res != Z_OK && res != Z_STREAM_END) if (res != Z_OK && res != Z_STREAM_END)
@ -891,7 +889,7 @@ _StartDataCompressor(ArchiveHandle *AH, TocEntry *te)
#endif #endif
/* Just be paranoid - maybe End is called after Start, with no Write */ /* Just be paranoid - maybe End is called after Start, with no Write */
zp->next_out = ctx->zlibOut; zp->next_out = (void *) ctx->zlibOut;
zp->avail_out = zlibOutSize; zp->avail_out = zlibOutSize;
} }
@ -937,7 +935,7 @@ _DoDeflate(ArchiveHandle *AH, lclContext *ctx, int flush)
die_horribly(AH, modulename, "could not write compressed chunk\n"); die_horribly(AH, modulename, "could not write compressed chunk\n");
ctx->filePos += zlibOutSize - zp->avail_out; ctx->filePos += zlibOutSize - zp->avail_out;
} }
zp->next_out = out; zp->next_out = (void *) out;
zp->avail_out = zlibOutSize; zp->avail_out = zlibOutSize;
} }
} }

26
src/bin/psql/mbprint.c
Unescape View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.16 2005/01/01 05:43:08 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.17 2005/09/24 17:53:27 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -158,7 +158,7 @@ ucs_wcwidth(pg_wchar ucs)
(ucs >= 0x20000 && ucs <= 0x2ffff))); (ucs >= 0x20000 && ucs <= 0x2ffff)));
} }
pg_wchar static pg_wchar
utf2ucs(const unsigned char *c) utf2ucs(const unsigned char *c)
{ {
/* /*
@ -195,7 +195,7 @@ utf2ucs(const unsigned char *c)
/* mb_utf_wcwidth : calculate column length for the utf8 string pwcs /* mb_utf_wcwidth : calculate column length for the utf8 string pwcs
*/ */
static int static int
mb_utf_wcswidth(unsigned char *pwcs, size_t len) mb_utf_wcswidth(const unsigned char *pwcs, size_t len)
{ {
int w, int w,
l = 0; l = 0;
@ -272,15 +272,15 @@ utf_charcheck(const unsigned char *c)
return -1; return -1;
} }
static unsigned char * static void
mb_utf_validate(unsigned char *pwcs) mb_utf_validate(unsigned char *pwcs)
{ {
int l = 0;
unsigned char *p = pwcs; unsigned char *p = pwcs;
unsigned char *p0 = pwcs;
while (*pwcs) while (*pwcs)
{ {
int l;
if ((l = utf_charcheck(pwcs)) > 0) if ((l = utf_charcheck(pwcs)) > 0)
{ {
if (p != pwcs) if (p != pwcs)
@ -304,7 +304,6 @@ mb_utf_validate(unsigned char *pwcs)
} }
if (p != pwcs) if (p != pwcs)
*p = '\0'; *p = '\0';
return p0;
} }
/* /*
@ -312,10 +311,10 @@ mb_utf_validate(unsigned char *pwcs)
*/ */
int int
pg_wcswidth(unsigned char *pwcs, size_t len, int encoding) pg_wcswidth(const char *pwcs, size_t len, int encoding)
{ {
if (encoding == PG_UTF8) if (encoding == PG_UTF8)
return mb_utf_wcswidth(pwcs, len); return mb_utf_wcswidth((const unsigned char *) pwcs, len);
else else
{ {
/* /*
@ -326,17 +325,18 @@ pg_wcswidth(unsigned char *pwcs, size_t len, int encoding)
} }
} }
unsigned char * char *
mbvalidate(unsigned char *pwcs, int encoding) mbvalidate(char *pwcs, int encoding)
{ {
if (encoding == PG_UTF8) if (encoding == PG_UTF8)
return mb_utf_validate(pwcs); mb_utf_validate((unsigned char *) pwcs);
else else
{ {
/* /*
* other encodings needing validation should add their own * other encodings needing validation should add their own
* routines here * routines here
*/ */
return pwcs;
} }
return pwcs;
} }

8
src/bin/psql/mbprint.h
Unescape View File

@ -1,13 +1,11 @@
/* $PostgreSQL: pgsql/src/bin/psql/mbprint.h,v 1.7 2003/11/29 22:40:49 pgsql Exp $ */ /* $PostgreSQL: pgsql/src/bin/psql/mbprint.h,v 1.8 2005/09/24 17:53:27 tgl Exp $ */
#ifndef MBPRINT_H #ifndef MBPRINT_H
#define MBPRINT_H #define MBPRINT_H
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
pg_wchar utf2ucs(const unsigned char *c); extern char *mbvalidate(char *pwcs, int encoding);
unsigned char *mbvalidate(unsigned char *pwcs, int encoding); extern int pg_wcswidth(const char *pwcs, size_t len, int encoding);
int pg_wcswidth(unsigned char *pwcs, size_t len, int encoding);
#endif /* MBPRINT_H */ #endif /* MBPRINT_H */

12
src/bin/psql/print.c
Unescape View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.73 2005/09/22 15:51:51 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.74 2005/09/24 17:53:27 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "common.h" #include "common.h"
@ -391,7 +391,7 @@ print_aligned_text(const char *title, const char *const *headers,
/* calc column widths */ /* calc column widths */
for (i = 0; i < col_count; i++) for (i = 0; i < col_count; i++)
{ {
tmp = pg_wcswidth((unsigned char *) headers[i], strlen(headers[i]), encoding); tmp = pg_wcswidth(headers[i], strlen(headers[i]), encoding);
if (tmp > widths[i]) if (tmp > widths[i])
widths[i] = tmp; widths[i] = tmp;
head_w[i] = tmp; head_w[i] = tmp;
@ -406,7 +406,7 @@ print_aligned_text(const char *title, const char *const *headers,
else else
numeric_locale_len = 0; numeric_locale_len = 0;
tmp = pg_wcswidth((unsigned char *) *ptr, strlen(*ptr), encoding) + numeric_locale_len; tmp = pg_wcswidth(*ptr, strlen(*ptr), encoding) + numeric_locale_len;
if (tmp > widths[i % col_count]) if (tmp > widths[i % col_count])
widths[i % col_count] = tmp; widths[i % col_count] = tmp;
cell_w[i] = tmp; cell_w[i] = tmp;
@ -425,7 +425,7 @@ print_aligned_text(const char *title, const char *const *headers,
/* print title */ /* print title */
if (title && !opt_tuples_only) if (title && !opt_tuples_only)
{ {
tmp = pg_wcswidth((unsigned char *) title, strlen(title), encoding); tmp = pg_wcswidth(title, strlen(title), encoding);
if (tmp >= total_w) if (tmp >= total_w)
fprintf(fout, "%s\n", title); fprintf(fout, "%s\n", title);
else else
@ -591,7 +591,7 @@ print_aligned_vertical(const char *title, const char *const *headers,
for (i = 0; i < col_count; i++) for (i = 0; i < col_count; i++)
{ {
tmp = pg_wcswidth((unsigned char *) headers[i], strlen(headers[i]), encoding); tmp = pg_wcswidth(headers[i], strlen(headers[i]), encoding);
if (tmp > hwidth) if (tmp > hwidth)
hwidth = tmp; hwidth = tmp;
head_w[i] = tmp; head_w[i] = tmp;
@ -623,7 +623,7 @@ print_aligned_vertical(const char *title, const char *const *headers,
else else
numeric_locale_len = 0; numeric_locale_len = 0;
tmp = pg_wcswidth((unsigned char *) *ptr, strlen(*ptr), encoding) + numeric_locale_len; tmp = pg_wcswidth(*ptr, strlen(*ptr), encoding) + numeric_locale_len;
if (tmp > dwidth) if (tmp > dwidth)
dwidth = tmp; dwidth = tmp;
cell_w[i] = tmp; cell_w[i] = tmp;

28
src/include/mb/pg_wchar.h
Unescape View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.61 2005/08/05 15:01:48 tgl Exp $ */ /* $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.62 2005/09/24 17:53:27 tgl Exp $ */
#ifndef PG_WCHAR_H #ifndef PG_WCHAR_H
#define PG_WCHAR_H #define PG_WCHAR_H
@ -280,22 +280,22 @@ typedef struct
unsigned int utf; /* UTF8 */ unsigned int utf; /* UTF8 */
} pg_local_to_utf; } pg_local_to_utf;
extern int pg_mb2wchar(const unsigned char *from, pg_wchar *to); extern int pg_mb2wchar(const char *from, pg_wchar *to);
extern int pg_mb2wchar_with_len(const unsigned char *from, pg_wchar *to, int len); extern int pg_mb2wchar_with_len(const char *from, pg_wchar *to, int len);
extern int pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2); extern int pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2);
extern int pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n); extern int pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n);
extern int pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n); extern int pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n);
extern size_t pg_wchar_strlen(const pg_wchar *wstr); extern size_t pg_wchar_strlen(const pg_wchar *wstr);
extern int pg_mblen(const unsigned char *mbstr); extern int pg_mblen(const char *mbstr);
extern int pg_dsplen(const unsigned char *mbstr); extern int pg_dsplen(const char *mbstr);
extern int pg_encoding_mblen(int encoding, const unsigned char *mbstr); extern int pg_encoding_mblen(int encoding, const char *mbstr);
extern int pg_encoding_dsplen(int encoding, const unsigned char *mbstr); extern int pg_encoding_dsplen(int encoding, const char *mbstr);
extern int pg_mule_mblen(const unsigned char *mbstr); extern int pg_mule_mblen(const unsigned char *mbstr);
extern int pg_mic_mblen(const unsigned char *mbstr); extern int pg_mic_mblen(const unsigned char *mbstr);
extern int pg_mbstrlen(const unsigned char *mbstr); extern int pg_mbstrlen(const char *mbstr);
extern int pg_mbstrlen_with_len(const unsigned char *mbstr, int len); extern int pg_mbstrlen_with_len(const char *mbstr, int len);
extern int pg_mbcliplen(const unsigned char *mbstr, int len, int limit); extern int pg_mbcliplen(const char *mbstr, int len, int limit);
extern int pg_mbcharcliplen(const unsigned char *mbstr, int len, int imit); extern int pg_mbcharcliplen(const char *mbstr, int len, int imit);
extern int pg_encoding_max_length(int encoding); extern int pg_encoding_max_length(int encoding);
extern int pg_database_encoding_max_length(void); extern int pg_database_encoding_max_length(void);
@ -317,8 +317,8 @@ extern unsigned char *pg_do_encoding_conversion(unsigned char *src, int len,
int src_encoding, int src_encoding,
int dest_encoding); int dest_encoding);
extern unsigned char *pg_client_to_server(unsigned char *s, int len); extern char *pg_client_to_server(const char *s, int len);
extern unsigned char *pg_server_to_client(unsigned char *s, int len); extern char *pg_server_to_client(const char *s, int len);
extern unsigned short BIG5toCNS(unsigned short big5, unsigned char *lc); extern unsigned short BIG5toCNS(unsigned short big5, unsigned char *lc);
extern unsigned short CNStoBIG5(unsigned short cns, unsigned char lc); extern unsigned short CNStoBIG5(unsigned short cns, unsigned char lc);
@ -329,7 +329,7 @@ extern void LocalToUtf(unsigned char *iso, unsigned char *utf,
extern void UtfToLocal(unsigned char *utf, unsigned char *iso, extern void UtfToLocal(unsigned char *utf, unsigned char *iso,
pg_utf_to_local *map, int size, int len); pg_utf_to_local *map, int size, int len);
extern bool pg_verifymbstr(const unsigned char *mbstr, int len, bool noError); extern bool pg_verifymbstr(const char *mbstr, int len, bool noError);
extern void pg_ascii2mic(unsigned char *src, unsigned char *dest, int len); extern void pg_ascii2mic(unsigned char *src, unsigned char *dest, int len);
extern void pg_mic2ascii(unsigned char *src, unsigned char *dest, int len); extern void pg_mic2ascii(unsigned char *src, unsigned char *dest, int len);

6
src/interfaces/libpq/fe-exec.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.174 2005/08/23 21:02:03 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.175 2005/09/24 17:53:28 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2429,7 +2429,7 @@ PQescapeBytea(const unsigned char *bintext, size_t binlen, size_t *bytealen)
{ {
if (*vp < 0x20 || *vp > 0x7e) if (*vp < 0x20 || *vp > 0x7e)
{ {
(void) sprintf(rp, "\\\\%03o", *vp); (void) sprintf((char *) rp, "\\\\%03o", *vp);
rp += 5; rp += 5;
} }
else if (*vp == '\'') else if (*vp == '\'')
@ -2483,7 +2483,7 @@ PQunescapeBytea(const unsigned char *strtext, size_t *retbuflen)
if (strtext == NULL) if (strtext == NULL)
return NULL; return NULL;
strtextlen = strlen(strtext); strtextlen = strlen((const char *) strtext);
/* /*
* Length of input is max length of output, but add one to avoid * Length of input is max length of output, but add one to avoid

6
src/interfaces/libpq/fe-misc.c
Unescape View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.119 2005/08/23 21:02:03 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.120 2005/09/24 17:53:28 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1092,7 +1092,7 @@ pqSocketPoll(int sock, int forRead, int forWrite, time_t end_time)
* specified encoding. * specified encoding.
*/ */
int int
PQmblen(const unsigned char *s, int encoding) PQmblen(const char *s, int encoding)
{ {
return (pg_encoding_mblen(encoding, s)); return (pg_encoding_mblen(encoding, s));
} }
@ -1102,7 +1102,7 @@ PQmblen(const unsigned char *s, int encoding)
* specified encoding. * specified encoding.
*/ */
int int
PQdsplen(const unsigned char *s, int encoding) PQdsplen(const char *s, int encoding)
{ {
return (pg_encoding_dsplen(encoding, s)); return (pg_encoding_dsplen(encoding, s));
} }

6
src/interfaces/libpq/libpq-fe.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.118 2005/06/13 02:26:53 tgl Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.119 2005/09/24 17:53:28 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -489,10 +489,10 @@ extern int lo_export(PGconn *conn, Oid lobjId, const char *filename);
/* === in fe-misc.c === */ /* === in fe-misc.c === */
/* Determine length of multibyte encoded char at *s */ /* Determine length of multibyte encoded char at *s */
extern int PQmblen(const unsigned char *s, int encoding); extern int PQmblen(const char *s, int encoding);
/* Determine display length of multibyte encoded char at *s */ /* Determine display length of multibyte encoded char at *s */
extern int PQdsplen(const unsigned char *s, int encoding); extern int PQdsplen(const char *s, int encoding);
/* Get encoding id from environment variable PGCLIENTENCODING */ /* Get encoding id from environment variable PGCLIENTENCODING */
extern int PQenv2encoding(void); extern int PQenv2encoding(void);

Write Preview
Loading…
Cancel
Save