projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark 'memcpy' obsolete.
[gnulib.git]
/
lib
/
trim.c
diff --git
a/lib/trim.c
b/lib/trim.c
index
3802301
..
9293a64
100644
(file)
--- a/
lib/trim.c
+++ b/
lib/trim.c
@@
-24,7
+24,7
@@
#include <ctype.h>
#include <string.h>
#include <ctype.h>
#include <string.h>
-#if HAVE_MBRTOWC
+#if HAVE_MBRTOWC
# include <stddef.h>
# include <stdlib.h>
# include "mbchar.h"
# include <stddef.h>
# include <stdlib.h>
# include "mbchar.h"
@@
-44,72
+44,72
@@
char *
trim2(const char *s, int how)
{
char *d;
trim2(const char *s, int how)
{
char *d;
-
+
d = strdup(s);
if (!d)
xalloc_die();
d = strdup(s);
if (!d)
xalloc_die();
-
+
#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
mbi_iterator_t i;
#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
mbi_iterator_t i;
-
+
/* Trim leading whitespaces. */
/* Trim leading whitespaces. */
- if (how != TRIM_TRAILING)
+ if (how != TRIM_TRAILING)
{
mbi_init (i, d, strlen (d));
{
mbi_init (i, d, strlen (d));
-
+
for (; mbi_avail (i) && mb_isspace (mbi_cur (i)); mbi_advance (i))
;
for (; mbi_avail (i) && mb_isspace (mbi_cur (i)); mbi_advance (i))
;
-
+
memmove (d, mbi_cur_ptr (i), strlen (mbi_cur_ptr (i)) + 1);
}
memmove (d, mbi_cur_ptr (i), strlen (mbi_cur_ptr (i)) + 1);
}
-
+
/* Trim trailing whitespaces. */
/* Trim trailing whitespaces. */
- if (how != TRIM_LEADING)
+ if (how != TRIM_LEADING)
{
int state = 0;
char *r IF_LINT (= NULL); /* used only while state = 2 */
{
int state = 0;
char *r IF_LINT (= NULL); /* used only while state = 2 */
-
+
mbi_init (i, d, strlen (d));
mbi_init (i, d, strlen (d));
- for (; mbi_avail (i); mbi_advance (i))
+ for (; mbi_avail (i); mbi_advance (i))
{
{
- if (state == 0 && mb_isspace (mbi_cur (i)))
+ if (state == 0 && mb_isspace (mbi_cur (i)))
{
state = 0;
continue;
}
{
state = 0;
continue;
}
-
+
if (state == 0 && !mb_isspace (mbi_cur (i)))
{
state = 1;
continue;
}
if (state == 0 && !mb_isspace (mbi_cur (i)))
{
state = 1;
continue;
}
-
+
if (state == 1 && !mb_isspace (mbi_cur (i)))
{
state = 1;
continue;
}
if (state == 1 && !mb_isspace (mbi_cur (i)))
{
state = 1;
continue;
}
-
- if (state == 1 && mb_isspace (mbi_cur (i)))
+
+ if (state == 1 && mb_isspace (mbi_cur (i)))
{
state = 2;
r = (char *) mbi_cur_ptr (i);
}
{
state = 2;
r = (char *) mbi_cur_ptr (i);
}
- else if (state == 2 && mb_isspace (mbi_cur (i)))
+ else if (state == 2 && mb_isspace (mbi_cur (i)))
{
state = 2;
{
state = 2;
- }
- else
+ }
+ else
{
state = 1;
}
}
{
state = 1;
}
}
-
- if (state == 2)
+
+ if (state == 2)
*r = '\0';
}
}
*r = '\0';
}
}
@@
-117,11
+117,11
@@
trim2(const char *s, int how)
#endif /* HAVE_MBRTOWC */
{
char *p;
#endif /* HAVE_MBRTOWC */
{
char *p;
-
+
/* Trim leading whitespaces. */
if (how != TRIM_TRAILING) {
for (p = d; *p && isspace ((unsigned char) *p); p++)
/* Trim leading whitespaces. */
if (how != TRIM_TRAILING) {
for (p = d; *p && isspace ((unsigned char) *p); p++)
- ;
+ ;
memmove (d, p, strlen (p) + 1);
}
memmove (d, p, strlen (p) + 1);
}
@@
-132,7
+132,7
@@
trim2(const char *s, int how)
*p = '\0';
}
}
*p = '\0';
}
}
-
+
return d;
}
return d;
}
-
+