summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2009-10-22 22:28:08 +0200
committerDenys Vlasenko2009-10-22 22:28:08 +0200
commitc0dab37d0a2e079d0e0c85aa979439373e9096ca (patch)
treea9604c6673dfef0726eebba516c5674bcf40ef3e /libbb
parent6935ec9c0b2ac58b1ddc206c21bea36582e1f233 (diff)
downloadbusybox-c0dab37d0a2e079d0e0c85aa979439373e9096ca.zip
busybox-c0dab37d0a2e079d0e0c85aa979439373e9096ca.tar.gz
*: 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')
-rw-r--r--libbb/ask_confirmation.c4
-rw-r--r--libbb/trim.c9
-rw-r--r--libbb/xatonum_template.c5
3 files changed, 7 insertions, 11 deletions
diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
index d08bc51..9dfbd15 100644
--- a/libbb/ask_confirmation.c
+++ b/libbb/ask_confirmation.c
@@ -20,9 +20,7 @@ int FAST_FUNC bb_ask_confirmation(void)
int c;
while (((c = getchar()) != EOF) && (c != '\n')) {
- /* Make sure we get the actual function call for isspace,
- * as speed is not critical here. */
- if (first && !(isspace)(c)) {
+ if (first && !isspace(c)) {
--first;
if ((c == 'y') || (c == 'Y')) {
++retval;
diff --git a/libbb/trim.c b/libbb/trim.c
index ea20ff3..df00b84 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';
diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c
index 339a7d3..c97a4b7 100644
--- a/libbb/xatonum_template.c
+++ b/libbb/xatonum_template.c
@@ -25,9 +25,8 @@ unsigned type FAST_FUNC xstrtou(_range_sfx)(const char *numstr, int base,
int old_errno;
char *e;
- /* Disallow '-' and any leading whitespace. Make sure we get the
- * actual isspace function rather than a macro implementaion. */
- if (*numstr == '-' || *numstr == '+' || (isspace)(*numstr))
+ /* Disallow '-' and any leading whitespace. */
+ if (*numstr == '-' || *numstr == '+' || isspace(*numstr))
goto inval;
/* Since this is a lib function, we're not allowed to reset errno to 0.