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/argv_split.c | |
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/argv_split.c')
-rw-r--r-- | lib/argv_split.c | 13 |
1 files changed, 3 insertions, 10 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; |