X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu8-strrchr.c;h=38beebe65199800169898b1979fa8d4b6a17e444;hb=06a366de002272748bd110dcd4da6d967ff57d46;hp=95f7d9f0f3a583280a782c8dda65ea909d7a4d1d;hpb=dca752e3ba6eb642265f00d3e0b16b685352b2e2;p=gnulib.git

diff --git a/lib/unistr/u8-strrchr.c b/lib/unistr/u8-strrchr.c
index 95f7d9f0f..38beebe65 100644
--- a/lib/unistr/u8-strrchr.c
+++ b/lib/unistr/u8-strrchr.c
@@ -1,29 +1,26 @@
 /* Search character in UTF-8 string.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2011 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
-   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 free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, 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.
+   Lesser 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.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include "unistr.h"
 
-#include "ucs4-utf8.h"
-
 uint8_t *
 u8_strrchr (const uint8_t *s, ucs4_t uc)
 {
@@ -37,69 +34,69 @@ u8_strrchr (const uint8_t *s, ucs4_t uc)
       uint8_t c0 = uc;
 
       for (;; s++)
-	{
-	  if (*s == c0)
-	    result = (uint8_t *) s;
-	  if (*s == 0)
-	    break;
-	}
+        {
+          if (*s == c0)
+            result = (uint8_t *) s;
+          if (*s == 0)
+            break;
+        }
     }
   else
     switch (u8_uctomb_aux (c, uc, 6))
       {
       case 2:
-	if (*s)
-	  {
-	    uint8_t c0 = c[0];
-	    uint8_t c1 = c[1];
+        if (*s)
+          {
+            uint8_t c0 = c[0];
+            uint8_t c1 = c[1];
 
-	    /* FIXME: Maybe walking the string via u8_mblen is a win?  */
-	    for (;; s++)
-	      {
-		if (s[1] == 0)
-		  break;
-		if (*s == c0 && s[1] == c1)
-		  result = (uint8_t *) s;
-	      }
-	  }
-	break;
+            /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+            for (;; s++)
+              {
+                if (s[1] == 0)
+                  break;
+                if (*s == c0 && s[1] == c1)
+                  result = (uint8_t *) s;
+              }
+          }
+        break;
 
       case 3:
-	if (*s && s[1])
-	  {
-	    uint8_t c0 = c[0];
-	    uint8_t c1 = c[1];
-	    uint8_t c2 = c[2];
+        if (*s && s[1])
+          {
+            uint8_t c0 = c[0];
+            uint8_t c1 = c[1];
+            uint8_t c2 = c[2];
 
-	    /* FIXME: Maybe walking the string via u8_mblen is a win?  */
-	    for (;; s++)
-	      {
-		if (s[2] == 0)
-		  break;
-		if (*s == c0 && s[1] == c1 && s[2] == c2)
-		  result = (uint8_t *) s;
-	      }
-	  }
-	break;
+            /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+            for (;; s++)
+              {
+                if (s[2] == 0)
+                  break;
+                if (*s == c0 && s[1] == c1 && s[2] == c2)
+                  result = (uint8_t *) s;
+              }
+          }
+        break;
 
       case 4:
-	if (*s && s[1] && s[2])
-	  {
-	    uint8_t c0 = c[0];
-	    uint8_t c1 = c[1];
-	    uint8_t c2 = c[2];
-	    uint8_t c3 = c[3];
+        if (*s && s[1] && s[2])
+          {
+            uint8_t c0 = c[0];
+            uint8_t c1 = c[1];
+            uint8_t c2 = c[2];
+            uint8_t c3 = c[3];
 
-	    /* FIXME: Maybe walking the string via u8_mblen is a win?  */
-	    for (;; s++)
-	      {
-		if (s[3] == 0)
-		  break;
-		if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
-		  result = (uint8_t *) s;
-	      }
-	  }
-	break;
+            /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+            for (;; s++)
+              {
+                if (s[3] == 0)
+                  break;
+                if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
+                  result = (uint8_t *) s;
+              }
+          }
+        break;
       }
   return result;
 }