aboutsummaryrefslogtreecommitdiff
path: root/libbb/trim.c
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-10-22 22:28:08 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-10-22 22:28:08 +0200
commitc0dab37d0a2e079d0e0c85aa979439373e9096ca (patch)
treea9604c6673dfef0726eebba516c5674bcf40ef3e /libbb/trim.c
parent6935ec9c0b2ac58b1ddc206c21bea36582e1f233 (diff)
downloadbusybox-c0dab37d0a2e079d0e0c85aa979439373e9096ca.tar.gz
busybox-c0dab37d0a2e079d0e0c85aa979439373e9096ca.tar.bz2
*: remove last function calls to isspace
function old new delta xstrtoul_range_sfx 232 231 -1 xstrtoull_range_sfx 295 293 -2 trim 82 80 -2 trim_trailing_spaces_and_print 57 52 -5 isspace 18 - -18 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/trim.c')
-rw-r--r--libbb/trim.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libbb/trim.c b/libbb/trim.c
index ea20ff370..df00b846e 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -13,7 +13,6 @@
void FAST_FUNC trim(char *s)
{
size_t len = strlen(s);
- size_t lws;
/* trim trailing whitespace */
while (len && isspace(s[len-1]))
@@ -21,10 +20,10 @@ void FAST_FUNC trim(char *s)
/* trim leading whitespace */
if (len) {
- lws = strspn(s, " \n\r\t\v");
- if (lws) {
- len -= lws;
- memmove(s, s + lws, len);
+ char *nws = skip_whitespace(s);
+ if ((nws - s) != 0) {
+ len -= (nws - s);
+ memmove(s, nws, len);
}
}
s[len] = '\0';