X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftrim.c;h=9293a64cecae2c79a3e007ad276788ebf3284e66;hb=56093e4d947bcc87bbc05ac3e8645509274f57b4;hp=3802301df4f1cca91e9554508c8f109bd0354bd4;hpb=cfc551f783f5bde5457a350fcc99bfc64857573d;p=gnulib.git diff --git a/lib/trim.c b/lib/trim.c index 3802301df..9293a64ce 100644 --- a/lib/trim.c +++ b/lib/trim.c @@ -24,7 +24,7 @@ #include #include -#if HAVE_MBRTOWC +#if HAVE_MBRTOWC # include # include # include "mbchar.h" @@ -44,72 +44,72 @@ char * trim2(const char *s, int how) { char *d; - + d = strdup(s); if (!d) xalloc_die(); - + #if HAVE_MBRTOWC if (MB_CUR_MAX > 1) { mbi_iterator_t i; - + /* Trim leading whitespaces. */ - if (how != TRIM_TRAILING) + if (how != TRIM_TRAILING) { mbi_init (i, d, strlen (d)); - + for (; mbi_avail (i) && mb_isspace (mbi_cur (i)); mbi_advance (i)) ; - + memmove (d, mbi_cur_ptr (i), strlen (mbi_cur_ptr (i)) + 1); } - + /* Trim trailing whitespaces. */ - if (how != TRIM_LEADING) + if (how != TRIM_LEADING) { int state = 0; char *r IF_LINT (= NULL); /* used only while state = 2 */ - + 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; } - + 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))) + + if (state == 1 && mb_isspace (mbi_cur (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; - } - else + } + else { state = 1; } } - - if (state == 2) + + if (state == 2) *r = '\0'; } } @@ -117,11 +117,11 @@ trim2(const char *s, int how) #endif /* HAVE_MBRTOWC */ { char *p; - + /* Trim leading whitespaces. */ if (how != TRIM_TRAILING) { for (p = d; *p && isspace ((unsigned char) *p); p++) - ; + ; memmove (d, p, strlen (p) + 1); } @@ -132,7 +132,7 @@ trim2(const char *s, int how) *p = '\0'; } } - + return d; } - +