projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intprops.h: adjust comment to match code change
[gnulib.git]
/
lib
/
mbssep.c
diff --git
a/lib/mbssep.c
b/lib/mbssep.c
index
a19f68f
..
42e791e
100644
(file)
--- a/
lib/mbssep.c
+++ b/
lib/mbssep.c
@@
-1,5
+1,5
@@
/* Tokenizing a string.
/* Tokenizing a string.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
-2011
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software: you can redistribute it and/or modify
@@
-20,46
+20,42
@@
/* Specification. */
#include <string.h>
/* Specification. */
#include <string.h>
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
char *
mbssep (char **stringp, const char *delim)
{
char *
mbssep (char **stringp, const char *delim)
{
-#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
char *start = *stringp;
char *ptr;
if (start == NULL)
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,
/* 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)
ptr = mbspbrk (start, delim);
if (ptr == NULL)
- {
- *stringp = NULL;
- return start;
- }
+
{
+
*stringp = NULL;
+
return start;
+
}
else
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
}
else
-#endif
return strsep (stringp, delim);
}
return strsep (stringp, delim);
}