Merge commit 'upstream/0.9.3'

1 files changed, 53 insertions, 52 deletions

diff --git a/lib/unistr/u8-strchr.c b/lib/unistr/u8-strchr.c
index 370a7930..3be14c79 100644
--- a/lib/unistr/u8-strchr.c
+++ b/lib/unistr/u8-strchr.c
@@ -1,5 +1,6 @@
 /* Search character in UTF-8 string.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2010 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
@@ -30,70 +31,70 @@ u8_strchr (const uint8_t *s, ucs4_t uc)
       uint8_t c0 = uc;
 
       for (;; s++)
-	{
-	  if (*s == c0)
-	    break;
-	  if (*s == 0)
-	    goto notfound;
-	}
+        {
+          if (*s == c0)
+            break;
+          if (*s == 0)
+            goto notfound;
+        }
       return (uint8_t *) s;
     }
   else
     switch (u8_uctomb_aux (c, uc, 6))
       {
       case 2:
-	if (*s == 0)
-	  goto notfound;
-	{
-	  uint8_t c0 = c[0];
-	  uint8_t c1 = c[1];
+        if (*s == 0)
+          goto notfound;
+        {
+          uint8_t c0 = c[0];
+          uint8_t c1 = c[1];
 
-	  for (;; s++)
-	    {
-	      if (s[1] == 0)
-		goto notfound;
-	      if (*s == c0 && s[1] == c1)
-		break;
-	    }
-	  return (uint8_t *) s;
-	}
+          for (;; s++)
+            {
+              if (s[1] == 0)
+                goto notfound;
+              if (*s == c0 && s[1] == c1)
+                break;
+            }
+          return (uint8_t *) s;
+        }
 
       case 3:
-	if (*s == 0 || s[1] == 0)
-	  goto notfound;
-	{
-	  uint8_t c0 = c[0];
-	  uint8_t c1 = c[1];
-	  uint8_t c2 = c[2];
+        if (*s == 0 || s[1] == 0)
+          goto notfound;
+        {
+          uint8_t c0 = c[0];
+          uint8_t c1 = c[1];
+          uint8_t c2 = c[2];
 
-	  for (;; s++)
-	    {
-	      if (s[2] == 0)
-		goto notfound;
-	      if (*s == c0 && s[1] == c1 && s[2] == c2)
-		break;
-	    }
-	  return (uint8_t *) s;
-	}
+          for (;; s++)
+            {
+              if (s[2] == 0)
+                goto notfound;
+              if (*s == c0 && s[1] == c1 && s[2] == c2)
+                break;
+            }
+          return (uint8_t *) s;
+        }
 
       case 4:
-	if (*s == 0 || s[1] == 0 || s[2] == 0)
-	  goto notfound;
-	{
-	  uint8_t c0 = c[0];
-	  uint8_t c1 = c[1];
-	  uint8_t c2 = c[2];
-	  uint8_t c3 = c[3];
+        if (*s == 0 || s[1] == 0 || s[2] == 0)
+          goto notfound;
+        {
+          uint8_t c0 = c[0];
+          uint8_t c1 = c[1];
+          uint8_t c2 = c[2];
+          uint8_t c3 = c[3];
 
-	  for (;; s++)
-	    {
-	      if (s[3] == 0)
-		goto notfound;
-	      if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
-		break;
-	    }
-	  return (uint8_t *) s;
-	}
+          for (;; s++)
+            {
+              if (s[3] == 0)
+                goto notfound;
+              if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
+                break;
+            }
+          return (uint8_t *) s;
+        }
       }
 notfound:
   return NULL;