maint: update copyright

[gnulib.git] / lib / mbsspn.c

diff --git a/lib/mbsspn.c b/lib/mbsspn.c
index 8f399b0..3d8e178 100644 (file)
--- a/lib/mbsspn.c
+++ b/lib/mbsspn.c
@@ -1,5 +1,5 @@
 /* Searching a string for a character outside a given set of characters.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,9 +20,7 @@
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Find the first occurrence in the character string STRING of any character
    not in the character string REJECT.  Return the number of bytes from the
@@ -38,58 +36,54 @@ mbsspn (const char *string, const char *reject)
     {
       unsigned char uc = (unsigned char) reject[0];
 
-#if HAVE_MBRTOWC
       if (MB_CUR_MAX > 1)
-       {
-         mbui_iterator_t iter;
+        {
+          mbui_iterator_t iter;
 
-         for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
-           if (!(mb_len (mbui_cur (iter)) == 1
-                 && (unsigned char) * mbui_cur_ptr (iter) == uc))
-             break;
-         return mbui_cur_ptr (iter) - string;
-       }
+          for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
+            if (!(mb_len (mbui_cur (iter)) == 1
+                  && (unsigned char) * mbui_cur_ptr (iter) == uc))
+              break;
+          return mbui_cur_ptr (iter) - string;
+        }
       else
-#endif
-       {
-         const char *ptr;
+        {
+          const char *ptr;
 
-         for (ptr = string; *ptr != '\0'; ptr++)
-           if ((unsigned char) *ptr != uc)
-             break;
-         return ptr - string;
-       }
+          for (ptr = string; *ptr != '\0'; ptr++)
+            if ((unsigned char) *ptr != uc)
+              break;
+          return ptr - string;
+        }
     }
   /* General case.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter;
 
       for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
-       {
-         if (mb_len (mbui_cur (iter)) == 1)
-           {
-             if (mbschr (reject, * mbui_cur_ptr (iter)) == NULL)
-               goto found;
-           }
-         else
-           {
-             mbui_iterator_t aiter;
+        {
+          if (mb_len (mbui_cur (iter)) == 1)
+            {
+              if (mbschr (reject, * mbui_cur_ptr (iter)) == NULL)
+                goto found;
+            }
+          else
+            {
+              mbui_iterator_t aiter;
 
-             for (mbui_init (aiter, reject);; mbui_advance (aiter))
-               {
-                 if (!mbui_avail (aiter))
-                   goto found;
-                 if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
-                   break;
-               }
-           }
-       }
+              for (mbui_init (aiter, reject);; mbui_advance (aiter))
+                {
+                  if (!mbui_avail (aiter))
+                    goto found;
+                  if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
+                    break;
+                }
+            }
+        }
      found:
       return mbui_cur_ptr (iter) - string;
     }
   else
-#endif
     return strspn (string, reject);
 }