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 /net | |
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 'net')
-rw-r--r-- | net/irda/irnet/irnet.h | 1 | ||||
-rw-r--r-- | net/irda/irnet/irnet_ppp.c | 8 | ||||
-rw-r--r-- | net/netfilter/xt_recent.c | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index b001c361ad30..4300df35d37d 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h | |||
@@ -249,6 +249,7 @@ | |||
249 | #include <linux/poll.h> | 249 | #include <linux/poll.h> |
250 | #include <linux/capability.h> | 250 | #include <linux/capability.h> |
251 | #include <linux/ctype.h> /* isspace() */ | 251 | #include <linux/ctype.h> /* isspace() */ |
252 | #include <linux/string.h> /* skip_spaces() */ | ||
252 | #include <asm/uaccess.h> | 253 | #include <asm/uaccess.h> |
253 | #include <linux/init.h> | 254 | #include <linux/init.h> |
254 | 255 | ||
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index 7dea882dbb75..156020d138b5 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c | |||
@@ -76,9 +76,8 @@ irnet_ctrl_write(irnet_socket * ap, | |||
76 | /* Look at the next command */ | 76 | /* Look at the next command */ |
77 | start = next; | 77 | start = next; |
78 | 78 | ||
79 | /* Scrap whitespaces before the command */ | 79 | /* Scrap whitespaces before the command */ |
80 | while(isspace(*start)) | 80 | start = skip_spaces(start); |
81 | start++; | ||
82 | 81 | ||
83 | /* ',' is our command separator */ | 82 | /* ',' is our command separator */ |
84 | next = strchr(start, ','); | 83 | next = strchr(start, ','); |
@@ -133,8 +132,7 @@ irnet_ctrl_write(irnet_socket * ap, | |||
133 | char * endp; | 132 | char * endp; |
134 | 133 | ||
135 | /* Scrap whitespaces before the command */ | 134 | /* Scrap whitespaces before the command */ |
136 | while(isspace(*begp)) | 135 | begp = skip_spaces(begp); |
137 | begp++; | ||
138 | 136 | ||
139 | /* Convert argument to a number (last arg is the base) */ | 137 | /* Convert argument to a number (last arg is the base) */ |
140 | addr = simple_strtoul(begp, &endp, 16); | 138 | addr = simple_strtoul(begp, &endp, 16); |
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c index eb0ceb846527..fc70a49c0afd 100644 --- a/net/netfilter/xt_recent.c +++ b/net/netfilter/xt_recent.c | |||
@@ -482,8 +482,7 @@ static ssize_t recent_old_proc_write(struct file *file, | |||
482 | if (copy_from_user(buf, input, size)) | 482 | if (copy_from_user(buf, input, size)) |
483 | return -EFAULT; | 483 | return -EFAULT; |
484 | 484 | ||
485 | while (isspace(*c)) | 485 | c = skip_spaces(c); |
486 | c++; | ||
487 | 486 | ||
488 | if (size - (c - buf) < 5) | 487 | if (size - (c - buf) < 5) |
489 | return c - buf; | 488 | return c - buf; |