maint: update copyright

[gnulib.git] / lib / mbssep.c

diff --git a/lib/mbssep.c b/lib/mbssep.c
index e83a539..d157ed1 100644 (file)
--- a/lib/mbssep.c
+++ b/lib/mbssep.c
@@ -1,11 +1,11 @@
 /* Tokenizing a string.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   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
@@ -13,54 +13,49 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 char *
 mbssep (char **stringp, const char *delim)
 {
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       char *start = *stringp;
       char *ptr;
 
       if (start == NULL)
-       return NULL;
+        return NULL;
 
       /* No need to optimize the cases of 0 or 1 delimiters specially,
-        since mbspbrk already optimizes them.  */
+         since mbspbrk already optimizes them.  */
 
       ptr = mbspbrk (start, delim);
 
       if (ptr == NULL)
-       {
-         *stringp = NULL;
-         return start;
-       }
+        {
+          *stringp = NULL;
+          return start;
+        }
       else
-       {
-         mbui_iterator_t iter;
-
-         mbui_init (iter, ptr);
-         if (!mbui_avail (iter))
-           abort ();
-         mbui_advance (iter);
-         *ptr = '\0';
-         *stringp = (char *) mbui_cur_ptr (iter);
-         return start;
-       }
+        {
+          mbui_iterator_t iter;
+
+          mbui_init (iter, ptr);
+          if (!mbui_avail (iter))
+            abort ();
+          mbui_advance (iter);
+          *ptr = '\0';
+          *stringp = (char *) mbui_cur_ptr (iter);
+          return start;
+        }
     }
   else
-#endif
     return strsep (stringp, delim);
 }