Update copyrights in source tree to 2008.

[postgresql] / src / backend / utils / mb / conversion_procs / utf8_and_cyrillic / utf8_and_cyrillic.c

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 81dc25f36165b479f8399cf6bd97a66649a471ce..b1dc6be3464b52583b98bb0abdf785521526062c 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -2,11 +2,11 @@
  *
  *       UTF8 and Cyrillic
  *
- * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.9 2004/12/31 22:02:14 pgsql Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.21 2008/01/01 19:45:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,24 +16,14 @@
 #include "mb/pg_wchar.h"
 #include "../../Unicode/utf8_to_koi8r.map"
 #include "../../Unicode/koi8r_to_utf8.map"
-#include "../../Unicode/utf8_to_win1251.map"
-#include "../../Unicode/win1251_to_utf8.map"
-#include "../../Unicode/utf8_to_alt.map"
-#include "../../Unicode/alt_to_utf8.map"
+
+PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(utf8_to_koi8r);
 PG_FUNCTION_INFO_V1(koi8r_to_utf8);
-PG_FUNCTION_INFO_V1(utf8_to_win1251);
-PG_FUNCTION_INFO_V1(win1251_to_utf8);
-PG_FUNCTION_INFO_V1(utf8_to_alt);
-PG_FUNCTION_INFO_V1(alt_to_utf8);
 
 extern Datum utf8_to_koi8r(PG_FUNCTION_ARGS);
 extern Datum koi8r_to_utf8(PG_FUNCTION_ARGS);
-extern Datum utf8_to_win1251(PG_FUNCTION_ARGS);
-extern Datum win1251_to_utf8(PG_FUNCTION_ARGS);
-extern Datum utf8_to_alt(PG_FUNCTION_ARGS);
-extern Datum alt_to_utf8(PG_FUNCTION_ARGS);
 
 /* ----------
  * conv_proc(
@@ -49,16 +39,16 @@ extern Datum alt_to_utf8(PG_FUNCTION_ARGS);
 Datum
 utf8_to_koi8r(PG_FUNCTION_ARGS)
 {
-       unsigned char *src = PG_GETARG_CSTRING(2);
-       unsigned char *dest = PG_GETARG_CSTRING(3);
+       unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
+       unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
        int                     len = PG_GETARG_INT32(4);
 
        Assert(PG_GETARG_INT32(0) == PG_UTF8);
        Assert(PG_GETARG_INT32(1) == PG_KOI8R);
        Assert(len >= 0);
 
-       UtfToLocal(src, dest, ULmap_KOI8R,
-                          sizeof(ULmap_KOI8R) / sizeof(pg_utf_to_local), len);
+       UtfToLocal(src, dest, ULmapKOI8R, NULL,
+                        sizeof(ULmapKOI8R) / sizeof(pg_utf_to_local), 0, PG_KOI8R, len);
 
        PG_RETURN_VOID();
 }
@@ -66,84 +56,16 @@ utf8_to_koi8r(PG_FUNCTION_ARGS)
 Datum
 koi8r_to_utf8(PG_FUNCTION_ARGS)
 {
-       unsigned char *src = PG_GETARG_CSTRING(2);
-       unsigned char *dest = PG_GETARG_CSTRING(3);
+       unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
+       unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
        int                     len = PG_GETARG_INT32(4);
 
        Assert(PG_GETARG_INT32(0) == PG_KOI8R);
        Assert(PG_GETARG_INT32(1) == PG_UTF8);
        Assert(len >= 0);
 
-       LocalToUtf(src, dest, LUmapKOI8R,
-                       sizeof(LUmapKOI8R) / sizeof(pg_local_to_utf), PG_KOI8R, len);
-
-       PG_RETURN_VOID();
-}
-
-Datum
-utf8_to_win1251(PG_FUNCTION_ARGS)
-{
-       unsigned char *src = PG_GETARG_CSTRING(2);
-       unsigned char *dest = PG_GETARG_CSTRING(3);
-       int                     len = PG_GETARG_INT32(4);
-
-       Assert(PG_GETARG_INT32(0) == PG_UTF8);
-       Assert(PG_GETARG_INT32(1) == PG_WIN1251);
-       Assert(len >= 0);
-
-       UtfToLocal(src, dest, ULmap_WIN1251,
-                          sizeof(ULmap_WIN1251) / sizeof(pg_utf_to_local), len);
-
-       PG_RETURN_VOID();
-}
-
-Datum
-win1251_to_utf8(PG_FUNCTION_ARGS)
-{
-       unsigned char *src = PG_GETARG_CSTRING(2);
-       unsigned char *dest = PG_GETARG_CSTRING(3);
-       int                     len = PG_GETARG_INT32(4);
-
-       Assert(PG_GETARG_INT32(0) == PG_WIN1251);
-       Assert(PG_GETARG_INT32(1) == PG_UTF8);
-       Assert(len >= 0);
-
-       LocalToUtf(src, dest, LUmapWIN1251,
-               sizeof(LUmapWIN1251) / sizeof(pg_local_to_utf), PG_WIN1251, len);
-
-       PG_RETURN_VOID();
-}
-
-Datum
-utf8_to_alt(PG_FUNCTION_ARGS)
-{
-       unsigned char *src = PG_GETARG_CSTRING(2);
-       unsigned char *dest = PG_GETARG_CSTRING(3);
-       int                     len = PG_GETARG_INT32(4);
-
-       Assert(PG_GETARG_INT32(0) == PG_UTF8);
-       Assert(PG_GETARG_INT32(1) == PG_ALT);
-       Assert(len >= 0);
-
-       UtfToLocal(src, dest, ULmap_ALT,
-                          sizeof(ULmap_ALT) / sizeof(pg_utf_to_local), len);
-
-       PG_RETURN_VOID();
-}
-
-Datum
-alt_to_utf8(PG_FUNCTION_ARGS)
-{
-       unsigned char *src = PG_GETARG_CSTRING(2);
-       unsigned char *dest = PG_GETARG_CSTRING(3);
-       int                     len = PG_GETARG_INT32(4);
-
-       Assert(PG_GETARG_INT32(0) == PG_ALT);
-       Assert(PG_GETARG_INT32(1) == PG_UTF8);
-       Assert(len >= 0);
-
-       LocalToUtf(src, dest, LUmapALT,
-                          sizeof(LUmapALT) / sizeof(pg_local_to_utf), PG_ALT, len);
+       LocalToUtf(src, dest, LUmapKOI8R, NULL,
+                        sizeof(LUmapKOI8R) / sizeof(pg_local_to_utf), 0, PG_KOI8R, len);
 
        PG_RETURN_VOID();
 }