gettimeofday: port recent C++ fix to Emacs

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

diff --git a/lib/unistr/u8-strmblen.c b/lib/unistr/u8-strmblen.c
index 52db99d..a4784e6 100644 (file)
--- a/lib/unistr/u8-strmblen.c
+++ b/lib/unistr/u8-strmblen.c
@@ -1,5 +1,6 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2013 Free Software
+   Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -23,7 +24,7 @@
 int
 u8_strmblen (const uint8_t *s)
 {
-  /* Keep in sync with unistr.h and utf8-ucs4.c.  */
+  /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
   uint8_t c = *s;
 
   if (c < 0x80)
@@ -31,64 +32,64 @@ u8_strmblen (const uint8_t *s)
   if (c >= 0xc2)
     {
       if (c < 0xe0)
-       {
+        {
 #if CONFIG_UNICODE_SAFETY
-         if ((s[1] ^ 0x80) < 0x40)
+          if ((s[1] ^ 0x80) < 0x40)
 #else
-         if (s[1] != 0)
+          if (s[1] != 0)
 #endif
-           return 2;
-       }
+            return 2;
+        }
       else if (c < 0xf0)
-       {
+        {
 #if CONFIG_UNICODE_SAFETY
-         if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-             && (c >= 0xe1 || s[1] >= 0xa0)
-             && (c != 0xed || s[1] < 0xa0))
+          if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+              && (c >= 0xe1 || s[1] >= 0xa0)
+              && (c != 0xed || s[1] < 0xa0))
 #else
-         if (s[1] != 0 && s[2] != 0)
+          if (s[1] != 0 && s[2] != 0)
 #endif
-           return 3;
-       }
+            return 3;
+        }
       else if (c < 0xf8)
-       {
+        {
 #if CONFIG_UNICODE_SAFETY
-         if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-             && (s[3] ^ 0x80) < 0x40
-             && (c >= 0xf1 || s[1] >= 0x90)
+          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))
+              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-            )
+             )
 #else
-         if (s[1] != 0 && s[2] != 0 && s[3] != 0)
+          if (s[1] != 0 && s[2] != 0 && s[3] != 0)
 #endif
-           return 4;
-       }
+            return 4;
+        }
 #if 0
       else if (c < 0xfc)
-       {
+        {
 #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))
+          if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+              && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+              && (c >= 0xf9 || s[1] >= 0x88))
 #else
-         if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0)
+          if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0)
 #endif
-           return 5;
-       }
+            return 5;
+        }
       else if (c < 0xfe)
-       {
+        {
 #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))
+          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))
 #else
-         if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0 && s[5] != 0)
+          if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0 && s[5] != 0)
 #endif
-           return 6;
-       }
+            return 6;
+        }
 #endif
     }
   /* invalid or incomplete multibyte character */