emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: remove last function calls to isspace

Browse Source 
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>
This commit is contained in:
Denys Vlasenko
2009-10-22 22:28:08 +02:00
parent 6935ec9c0b
commit c0dab37d0a
8 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/ask_confirmation.c
View File

@@ -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;

9
libbb/trim.c
View File

@@ -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';

5
libbb/xatonum_template.c
View File

@@ -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.