Merge commit 'upstream/0.9.3'

1 files changed, 22 insertions, 21 deletions

diff --git a/lib/unistr/u16-strrchr.c b/lib/unistr/u16-strrchr.c
index b3c7ab03..3cf3de2a 100644
--- a/lib/unistr/u16-strrchr.c
+++ b/lib/unistr/u16-strrchr.c
@@ -1,5 +1,6 @@
 /* Search character in UTF-16 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
@@ -33,32 +34,32 @@ u16_strrchr (const uint16_t *s, ucs4_t uc)
       uint16_t c0 = uc;
 
       for (;; s++)
-	{
-	  if (*s == c0)
-	    result = (uint16_t *) s;
-	  if (*s == 0)
-	    break;
-	}
+        {
+          if (*s == c0)
+            result = (uint16_t *) s;
+          if (*s == 0)
+            break;
+        }
     }
   else
     switch (u16_uctomb_aux (c, uc, 2))
       {
       case 2:
-	if (*s)
-	  {
-	    uint16_t c0 = c[0];
-	    uint16_t c1 = c[1];
+        if (*s)
+          {
+            uint16_t c0 = c[0];
+            uint16_t c1 = c[1];
 
-	    /* FIXME: Maybe walking the string via u16_mblen is a win?  */
-	    for (;; s++)
-	      {
-		if (s[1] == 0)
-		  break;
-		if (*s == c0 && s[1] == c1)
-		  result = (uint16_t *) s;
-	      }
-	  }
-	break;
+            /* FIXME: Maybe walking the string via u16_mblen is a win?  */
+            for (;; s++)
+              {
+                if (s[1] == 0)
+                  break;
+                if (*s == c0 && s[1] == c1)
+                  result = (uint16_t *) s;
+              }
+          }
+        break;
       }
   return result;
 }