Move to here from utf16-ucs4.c.

[gnulib.git] / lib / unistr / u8-mbtouc.c

diff --git a/lib/unistr/u8-mbtouc.c b/lib/unistr/u8-mbtouc.c
index 7f61b67..9f9bec9 100644 (file)
--- a/lib/unistr/u8-mbtouc.c
+++ b/lib/unistr/u8-mbtouc.c
@@ -40,9 +40,7 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 2)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40)
-#endif
                {
                  *puc = ((unsigned int) (c & 0x1f) << 6)
                         | (unsigned int) (s[1] ^ 0x80);
@@ -61,11 +59,9 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 3)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
                  && (c >= 0xe1 || s[1] >= 0xa0)
                  && (c != 0xed || s[1] < 0xa0))
-#endif
                {
                  *puc = ((unsigned int) (c & 0x0f) << 12)
                         | ((unsigned int) (s[1] ^ 0x80) << 6)
@@ -85,7 +81,6 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 4)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
                  && (s[3] ^ 0x80) < 0x40
                  && (c >= 0xf1 || s[1] >= 0x90)
@@ -93,7 +88,6 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
                 )
-#endif
                {
                  *puc = ((unsigned int) (c & 0x07) << 18)
                         | ((unsigned int) (s[1] ^ 0x80) << 12)
@@ -115,11 +109,9 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 5)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
                  && (c >= 0xf9 || s[1] >= 0x88))
-#endif
                {
                  *puc = ((unsigned int) (c & 0x03) << 24)
                         | ((unsigned int) (s[1] ^ 0x80) << 18)
@@ -141,12 +133,10 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 6)
            {
-#if CONFIG_UNICODE_SAFETY
              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))
-#endif
                {
                  *puc = ((unsigned int) (c & 0x01) << 30)
                         | ((unsigned int) (s[1] ^ 0x80) << 24)