3 files changed, 7 insertions, 11 deletions

diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
index d08bc515e..9dfbd15cf 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 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';
diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c
index 339a7d35f..c97a4b795 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.