Remove cvs keywords from all files.

[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 f732cce720e71cd305dc804a1fa987ceb32ed611..c2e1f5284bcf964181e95d8fd919d62911d57a19 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-2010, 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.13 2006/02/18 16:15:22 petere Exp $
+ *       src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
  *
  *-------------------------------------------------------------------------
  */
@@ -16,13 +16,23 @@
 #include "mb/pg_wchar.h"
 #include "../../Unicode/utf8_to_koi8r.map"
 #include "../../Unicode/koi8r_to_utf8.map"
+#include "../../Unicode/utf8_to_koi8u.map"
+#include "../../Unicode/koi8u_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_koi8u);
+PG_FUNCTION_INFO_V1(koi8u_to_utf8);
+
 extern Datum utf8_to_koi8r(PG_FUNCTION_ARGS);
 extern Datum koi8r_to_utf8(PG_FUNCTION_ARGS);
 
+extern Datum utf8_to_koi8u(PG_FUNCTION_ARGS);
+extern Datum koi8u_to_utf8(PG_FUNCTION_ARGS);
+
 /* ----------
  * conv_proc(
  *             INTEGER,        -- source encoding id
@@ -41,12 +51,10 @@ utf8_to_koi8r(PG_FUNCTION_ARGS)
        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);
+       CHECK_ENCODING_CONVERSION_ARGS(PG_UTF8, PG_KOI8R);
 
-       UtfToLocal(src, dest, ULmapKOI8R,
-                          sizeof(ULmapKOI8R) / 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();
 }
@@ -58,13 +66,40 @@ koi8r_to_utf8(PG_FUNCTION_ARGS)
        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);
+       CHECK_ENCODING_CONVERSION_ARGS(PG_KOI8R, PG_UTF8);
+
+       LocalToUtf(src, dest, LUmapKOI8R, NULL,
+                        sizeof(LUmapKOI8R) / sizeof(pg_local_to_utf), 0, PG_KOI8R, len);
+
+       PG_RETURN_VOID();
+}
+
+Datum
+utf8_to_koi8u(PG_FUNCTION_ARGS)
+{
+       unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
+       unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
+       int                     len = PG_GETARG_INT32(4);
+
+       CHECK_ENCODING_CONVERSION_ARGS(PG_UTF8, PG_KOI8U);
 
-       LocalToUtf(src, dest, LUmapKOI8R,
-                          sizeof(LUmapKOI8R) / sizeof(pg_local_to_utf), PG_KOI8R, len);
+       UtfToLocal(src, dest, ULmapKOI8U, NULL,
+                        sizeof(ULmapKOI8U) / sizeof(pg_utf_to_local), 0, PG_KOI8U, len);
 
        PG_RETURN_VOID();
 }
 
+Datum
+koi8u_to_utf8(PG_FUNCTION_ARGS)
+{
+       unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2);
+       unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3);
+       int                     len = PG_GETARG_INT32(4);
+
+       CHECK_ENCODING_CONVERSION_ARGS(PG_KOI8U, PG_UTF8);
+
+       LocalToUtf(src, dest, LUmapKOI8U, NULL,
+                        sizeof(LUmapKOI8U) / sizeof(pg_local_to_utf), 0, PG_KOI8U, len);
+
+       PG_RETURN_VOID();
+}