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 /drivers/md | |
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 'drivers/md')
-rw-r--r-- | drivers/md/dm-table.c | 6 | ||||
-rw-r--r-- | drivers/md/md.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 1a6cb3c7822e..91976e8fae5f 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/blkdev.h> | 12 | #include <linux/blkdev.h> |
13 | #include <linux/namei.h> | 13 | #include <linux/namei.h> |
14 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
15 | #include <linux/string.h> | ||
15 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
16 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
17 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
@@ -600,11 +601,8 @@ int dm_split_args(int *argc, char ***argvp, char *input) | |||
600 | return -ENOMEM; | 601 | return -ENOMEM; |
601 | 602 | ||
602 | while (1) { | 603 | while (1) { |
603 | start = end; | ||
604 | |||
605 | /* Skip whitespace */ | 604 | /* Skip whitespace */ |
606 | while (*start && isspace(*start)) | 605 | start = skip_spaces(end); |
607 | start++; | ||
608 | 606 | ||
609 | if (!*start) | 607 | if (!*start) |
610 | break; /* success, we hit the end */ | 608 | break; /* success, we hit the end */ |
diff --git a/drivers/md/md.c b/drivers/md/md.c index e1f3c1715cca..6f9148623a4d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/buffer_head.h> /* for invalidate_bdev */ | 39 | #include <linux/buffer_head.h> /* for invalidate_bdev */ |
40 | #include <linux/poll.h> | 40 | #include <linux/poll.h> |
41 | #include <linux/ctype.h> | 41 | #include <linux/ctype.h> |
42 | #include <linux/string.h> | ||
42 | #include <linux/hdreg.h> | 43 | #include <linux/hdreg.h> |
43 | #include <linux/proc_fs.h> | 44 | #include <linux/proc_fs.h> |
44 | #include <linux/random.h> | 45 | #include <linux/random.h> |
@@ -3439,8 +3440,7 @@ bitmap_store(mddev_t *mddev, const char *buf, size_t len) | |||
3439 | } | 3440 | } |
3440 | if (*end && !isspace(*end)) break; | 3441 | if (*end && !isspace(*end)) break; |
3441 | bitmap_dirty_bits(mddev->bitmap, chunk, end_chunk); | 3442 | bitmap_dirty_bits(mddev->bitmap, chunk, end_chunk); |
3442 | buf = end; | 3443 | buf = skip_spaces(end); |
3443 | while (isspace(*buf)) buf++; | ||
3444 | } | 3444 | } |
3445 | bitmap_unplug(mddev->bitmap); /* flush the bits to disk */ | 3445 | bitmap_unplug(mddev->bitmap); /* flush the bits to disk */ |
3446 | out: | 3446 | out: |