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 /arch/um/drivers/mconsole_kern.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 'arch/um/drivers/mconsole_kern.c')
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index f0fa47f10e6c..51069245b79a 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/console.h> | 7 | #include <linux/console.h> |
8 | #include <linux/ctype.h> | 8 | #include <linux/ctype.h> |
9 | #include <linux/string.h> | ||
9 | #include <linux/interrupt.h> | 10 | #include <linux/interrupt.h> |
10 | #include <linux/list.h> | 11 | #include <linux/list.h> |
11 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
@@ -131,7 +132,7 @@ void mconsole_proc(struct mc_request *req) | |||
131 | char *ptr = req->request.data, *buf; | 132 | char *ptr = req->request.data, *buf; |
132 | 133 | ||
133 | ptr += strlen("proc"); | 134 | ptr += strlen("proc"); |
134 | while (isspace(*ptr)) ptr++; | 135 | ptr = skip_spaces(ptr); |
135 | 136 | ||
136 | proc = get_fs_type("proc"); | 137 | proc = get_fs_type("proc"); |
137 | if (proc == NULL) { | 138 | if (proc == NULL) { |
@@ -212,8 +213,7 @@ void mconsole_proc(struct mc_request *req) | |||
212 | char *ptr = req->request.data; | 213 | char *ptr = req->request.data; |
213 | 214 | ||
214 | ptr += strlen("proc"); | 215 | ptr += strlen("proc"); |
215 | while (isspace(*ptr)) | 216 | ptr = skip_spaces(ptr); |
216 | ptr++; | ||
217 | snprintf(path, sizeof(path), "/proc/%s", ptr); | 217 | snprintf(path, sizeof(path), "/proc/%s", ptr); |
218 | 218 | ||
219 | fd = sys_open(path, 0, 0); | 219 | fd = sys_open(path, 0, 0); |
@@ -560,8 +560,7 @@ void mconsole_config(struct mc_request *req) | |||
560 | int err; | 560 | int err; |
561 | 561 | ||
562 | ptr += strlen("config"); | 562 | ptr += strlen("config"); |
563 | while (isspace(*ptr)) | 563 | ptr = skip_spaces(ptr); |
564 | ptr++; | ||
565 | dev = mconsole_find_dev(ptr); | 564 | dev = mconsole_find_dev(ptr); |
566 | if (dev == NULL) { | 565 | if (dev == NULL) { |
567 | mconsole_reply(req, "Bad configuration option", 1, 0); | 566 | mconsole_reply(req, "Bad configuration option", 1, 0); |
@@ -588,7 +587,7 @@ void mconsole_remove(struct mc_request *req) | |||
588 | int err, start, end, n; | 587 | int err, start, end, n; |
589 | 588 | ||
590 | ptr += strlen("remove"); | 589 | ptr += strlen("remove"); |
591 | while (isspace(*ptr)) ptr++; | 590 | ptr = skip_spaces(ptr); |
592 | dev = mconsole_find_dev(ptr); | 591 | dev = mconsole_find_dev(ptr); |
593 | if (dev == NULL) { | 592 | if (dev == NULL) { |
594 | mconsole_reply(req, "Bad remove option", 1, 0); | 593 | mconsole_reply(req, "Bad remove option", 1, 0); |
@@ -712,7 +711,7 @@ void mconsole_sysrq(struct mc_request *req) | |||
712 | char *ptr = req->request.data; | 711 | char *ptr = req->request.data; |
713 | 712 | ||
714 | ptr += strlen("sysrq"); | 713 | ptr += strlen("sysrq"); |
715 | while (isspace(*ptr)) ptr++; | 714 | ptr = skip_spaces(ptr); |
716 | 715 | ||
717 | /* | 716 | /* |
718 | * With 'b', the system will shut down without a chance to reply, | 717 | * With 'b', the system will shut down without a chance to reply, |
@@ -757,8 +756,7 @@ void mconsole_stack(struct mc_request *req) | |||
757 | */ | 756 | */ |
758 | 757 | ||
759 | ptr += strlen("stack"); | 758 | ptr += strlen("stack"); |
760 | while (isspace(*ptr)) | 759 | ptr = skip_spaces(ptr); |
761 | ptr++; | ||
762 | 760 | ||
763 | /* | 761 | /* |
764 | * Should really check for multiple pids or reject bad args here | 762 | * Should really check for multiple pids or reject bad args here |