diff options
author | André Goddard Rosa <andre.goddard@gmail.com> | 2009-12-14 21:01:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:32 -0500 |
commit | e7d2860b690d4f3bed6824757c540579638e3d1e (patch) | |
tree | 84268ee28893256fd6a6a7e1d4474f61dbee74e7 /lib | |
parent | 84c95c9acf088c99d8793d78036b67faa5d0b851 (diff) |
tree-wide: convert open calls to remove spaces to skip_spaces() lib function
Makes use of skip_spaces() defined in lib/string.c for removing leading
spaces from strings all over the tree.
It decreases lib.a code size by 47 bytes and reuses the function tree-wide:
text data bss dec hex filename
64688 584 592 65864 10148 (TOTALS-BEFORE)
64641 584 592 65817 10119 (TOTALS-AFTER)
Also, while at it, if we see (*str && isspace(*str)), we can be sure to
remove the first condition (*str) as the second one (isspace(*str)) also
evaluates to 0 whenever *str == 0, making it redundant. In other words,
"a char equals zero is never a space".
Julia Lawall tried the semantic patch (http://coccinelle.lip6.fr) below,
and found occurrences of this pattern on 3 more files:
drivers/leds/led-class.c
drivers/leds/ledtrig-timer.c
drivers/video/output.c
@@
expression str;
@@
( // ignore skip_spaces cases
while (*str && isspace(*str)) { \(str++;\|++str;\) }
|
- *str &&
isspace(*str)
)
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Cc: Julia Lawall <julia@diku.dk>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Neil Brown <neilb@suse.de>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: David Howells <dhowells@redhat.com>
Cc: <linux-ext4@vger.kernel.org>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/argv_split.c | 13 | ||||
-rw-r--r-- | lib/dynamic_debug.c | 4 | ||||
-rw-r--r-- | lib/vsprintf.c | 15 |
3 files changed, 9 insertions, 23 deletions
diff --git a/lib/argv_split.c b/lib/argv_split.c index 5205a8dae5bc..4b1b083f219c 100644 --- a/lib/argv_split.c +++ b/lib/argv_split.c | |||
@@ -4,17 +4,10 @@ | |||
4 | 4 | ||
5 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
6 | #include <linux/ctype.h> | 6 | #include <linux/ctype.h> |
7 | #include <linux/string.h> | ||
7 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
8 | #include <linux/module.h> | 9 | #include <linux/module.h> |
9 | 10 | ||
10 | static const char *skip_sep(const char *cp) | ||
11 | { | ||
12 | while (*cp && isspace(*cp)) | ||
13 | cp++; | ||
14 | |||
15 | return cp; | ||
16 | } | ||
17 | |||
18 | static const char *skip_arg(const char *cp) | 11 | static const char *skip_arg(const char *cp) |
19 | { | 12 | { |
20 | while (*cp && !isspace(*cp)) | 13 | while (*cp && !isspace(*cp)) |
@@ -28,7 +21,7 @@ static int count_argc(const char *str) | |||
28 | int count = 0; | 21 | int count = 0; |
29 | 22 | ||
30 | while (*str) { | 23 | while (*str) { |
31 | str = skip_sep(str); | 24 | str = skip_spaces(str); |
32 | if (*str) { | 25 | if (*str) { |
33 | count++; | 26 | count++; |
34 | str = skip_arg(str); | 27 | str = skip_arg(str); |
@@ -82,7 +75,7 @@ char **argv_split(gfp_t gfp, const char *str, int *argcp) | |||
82 | argvp = argv; | 75 | argvp = argv; |
83 | 76 | ||
84 | while (*str) { | 77 | while (*str) { |
85 | str = skip_sep(str); | 78 | str = skip_spaces(str); |
86 | 79 | ||
87 | if (*str) { | 80 | if (*str) { |
88 | const char *p = str; | 81 | const char *p = str; |
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index e22c148e4b7f..f93502915988 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
22 | #include <linux/sysctl.h> | 22 | #include <linux/sysctl.h> |
23 | #include <linux/ctype.h> | 23 | #include <linux/ctype.h> |
24 | #include <linux/string.h> | ||
24 | #include <linux/uaccess.h> | 25 | #include <linux/uaccess.h> |
25 | #include <linux/dynamic_debug.h> | 26 | #include <linux/dynamic_debug.h> |
26 | #include <linux/debugfs.h> | 27 | #include <linux/debugfs.h> |
@@ -209,8 +210,7 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords) | |||
209 | char *end; | 210 | char *end; |
210 | 211 | ||
211 | /* Skip leading whitespace */ | 212 | /* Skip leading whitespace */ |
212 | while (*buf && isspace(*buf)) | 213 | buf = skip_spaces(buf); |
213 | buf++; | ||
214 | if (!*buf) | 214 | if (!*buf) |
215 | break; /* oh, it was trailing whitespace */ | 215 | break; /* oh, it was trailing whitespace */ |
216 | 216 | ||
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index c50733a690f0..7857d4dd62d3 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -1766,13 +1766,6 @@ EXPORT_SYMBOL_GPL(bprintf); | |||
1766 | 1766 | ||
1767 | #endif /* CONFIG_BINARY_PRINTF */ | 1767 | #endif /* CONFIG_BINARY_PRINTF */ |
1768 | 1768 | ||
1769 | static noinline char *skip_space(const char *str) | ||
1770 | { | ||
1771 | while (isspace(*str)) | ||
1772 | ++str; | ||
1773 | return (char *)str; | ||
1774 | } | ||
1775 | |||
1776 | /** | 1769 | /** |
1777 | * vsscanf - Unformat a buffer into a list of arguments | 1770 | * vsscanf - Unformat a buffer into a list of arguments |
1778 | * @buf: input buffer | 1771 | * @buf: input buffer |
@@ -1794,8 +1787,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args) | |||
1794 | * white space, including none, in the input. | 1787 | * white space, including none, in the input. |
1795 | */ | 1788 | */ |
1796 | if (isspace(*fmt)) { | 1789 | if (isspace(*fmt)) { |
1797 | fmt = skip_space(fmt); | 1790 | fmt = skip_spaces(++fmt); |
1798 | str = skip_space(str); | 1791 | str = skip_spaces(str); |
1799 | } | 1792 | } |
1800 | 1793 | ||
1801 | /* anything that is not a conversion must match exactly */ | 1794 | /* anything that is not a conversion must match exactly */ |
@@ -1865,7 +1858,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args) | |||
1865 | if (field_width == -1) | 1858 | if (field_width == -1) |
1866 | field_width = INT_MAX; | 1859 | field_width = INT_MAX; |
1867 | /* first, skip leading white space in buffer */ | 1860 | /* first, skip leading white space in buffer */ |
1868 | str = skip_space(str); | 1861 | str = skip_spaces(str); |
1869 | 1862 | ||
1870 | /* now copy until next white space */ | 1863 | /* now copy until next white space */ |
1871 | while (*str && !isspace(*str) && field_width--) | 1864 | while (*str && !isspace(*str) && field_width--) |
@@ -1907,7 +1900,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args) | |||
1907 | /* have some sort of integer conversion. | 1900 | /* have some sort of integer conversion. |
1908 | * first, skip white space in buffer. | 1901 | * first, skip white space in buffer. |
1909 | */ | 1902 | */ |
1910 | str = skip_space(str); | 1903 | str = skip_spaces(str); |
1911 | 1904 | ||
1912 | digit = *str; | 1905 | digit = *str; |
1913 | if (is_sign && digit == '-') | 1906 | if (is_sign && digit == '-') |