From: Bruno Haible <bruno@clisp.org>
Date: Sun, 28 Jan 2007 01:40:27 +0000 (+0000)
Subject: Move to utf8-ucs4.c.
X-Git-Tag: cvs-readonly~1217
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=365a1876f25a540efd69bb71f2254eeee7d7a32e;p=gnulib.git

Move to utf8-ucs4.c.
---

diff --git a/lib/unistr/utf8-ucs4-safe.c b/lib/unistr/utf8-ucs4-safe.c
deleted file mode 100644
index fc6a906f4..000000000
--- a/lib/unistr/utf8-ucs4-safe.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2001.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "utf8-ucs4-safe.h"
-
-int
-u8_mbtouc_safe_aux (ucs4_t *puc, const uint8_t *s, size_t n)
-{
-  uint8_t c = *s;
-
-  if (c >= 0xc2)
-    {
-      if (c < 0xe0)
-	{
-	  if (n >= 2)
-	    {
-	      if ((s[1] ^ 0x80) < 0x40)
-		{
-		  *puc = ((unsigned int) (c & 0x1f) << 6)
-		         | (unsigned int) (s[1] ^ 0x80);
-		  return 2;
-		}
-	      /* invalid multibyte character */
-	    }
-	  else
-	    {
-	      /* incomplete multibyte character */
-	      *puc = 0xfffd;
-	      return n;
-	    }
-	}
-      else if (c < 0xf0)
-	{
-	  if (n >= 3)
-	    {
-	      if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (c >= 0xe1 || s[1] >= 0xa0)
-		  && (c != 0xed || s[1] < 0xa0))
-		{
-		  *puc = ((unsigned int) (c & 0x0f) << 12)
-		         | ((unsigned int) (s[1] ^ 0x80) << 6)
-		         | (unsigned int) (s[2] ^ 0x80);
-		  return 3;
-		}
-	      /* invalid multibyte character */
-	    }
-	  else
-	    {
-	      /* incomplete multibyte character */
-	      *puc = 0xfffd;
-	      return n;
-	    }
-	}
-      else if (c < 0xf8)
-	{
-	  if (n >= 4)
-	    {
-	      if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (s[3] ^ 0x80) < 0x40
-		  && (c >= 0xf1 || s[1] >= 0x90)
-#if 1
-		  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
-#endif
-		 )
-		{
-		  *puc = ((unsigned int) (c & 0x07) << 18)
-		         | ((unsigned int) (s[1] ^ 0x80) << 12)
-		         | ((unsigned int) (s[2] ^ 0x80) << 6)
-		         | (unsigned int) (s[3] ^ 0x80);
-		  return 4;
-		}
-	      /* invalid multibyte character */
-	    }
-	  else
-	    {
-	      /* incomplete multibyte character */
-	      *puc = 0xfffd;
-	      return n;
-	    }
-	}
-#if 0
-      else if (c < 0xfc)
-	{
-	  if (n >= 5)
-	    {
-	      if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-		  && (c >= 0xf9 || s[1] >= 0x88))
-		{
-		  *puc = ((unsigned int) (c & 0x03) << 24)
-		         | ((unsigned int) (s[1] ^ 0x80) << 18)
-		         | ((unsigned int) (s[2] ^ 0x80) << 12)
-		         | ((unsigned int) (s[3] ^ 0x80) << 6)
-		         | (unsigned int) (s[4] ^ 0x80);
-		  return 5;
-		}
-	      /* invalid multibyte character */
-	    }
-	  else
-	    {
-	      /* incomplete multibyte character */
-	      *puc = 0xfffd;
-	      return n;
-	    }
-	}
-      else if (c < 0xfe)
-	{
-	  if (n >= 6)
-	    {
-	      if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-		  && (s[5] ^ 0x80) < 0x40
-		  && (c >= 0xfd || s[1] >= 0x84))
-		{
-		  *puc = ((unsigned int) (c & 0x01) << 30)
-		         | ((unsigned int) (s[1] ^ 0x80) << 24)
-		         | ((unsigned int) (s[2] ^ 0x80) << 18)
-		         | ((unsigned int) (s[3] ^ 0x80) << 12)
-		         | ((unsigned int) (s[4] ^ 0x80) << 6)
-		         | (unsigned int) (s[5] ^ 0x80);
-		  return 6;
-		}
-	      /* invalid multibyte character */
-	    }
-	  else
-	    {
-	      /* incomplete multibyte character */
-	      *puc = 0xfffd;
-	      return n;
-	    }
-	}
-#endif
-    }
-  /* invalid multibyte character */
-  *puc = 0xfffd;
-  return 1;
-}