tree-wide: convert open calls to remove spaces to skip_spaces() lib function
Subsystems (20)
[email protected]
maintainerPATCH 156/196 tree-wide: convert open calls to remove spaces to skip_spaces() lib function
From: André Goddard Rosa <[email protected]>
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)
)
---
arch/s390/kernel/debug.c | 3 +- arch/um/drivers/mconsole_kern.c | 16 ++++------ arch/x86/kernel/cpu/mtrr/if.c | 11 ++----- drivers/leds/led-class.c | 2 - drivers/leds/ledtrig-timer.c | 4 +- drivers/md/dm-table.c | 6 +--- drivers/md/md.c | 4 +- drivers/parisc/pdc_stable.c | 9 ++---- drivers/platform/x86/thinkpad_acpi.c | 7 +--- drivers/pnp/interface.c | 36 ++++++------------------ drivers/s390/block/dasd_proc.c | 5 ++- drivers/video/backlight/lcd.c | 4 +- drivers/video/display/display-sysfs.c | 2 - drivers/video/output.c | 2 - fs/cachefiles/daemon.c | 4 +- fs/ext4/super.c | 7 +--- kernel/params.c | 8 ++--- lib/argv_split.c | 13 ++------ lib/dynamic_debug.c | 4 +- lib/vsprintf.c | 15 ++-------- net/irda/irnet/irnet.h | 1 net/irda/irnet/irnet_ppp.c | 8 ++--- net/netfilter/xt_recent.c | 3 -- sound/pci/hda/hda_hwdep.c | 7 ++-- 24 files changed, 66 insertions(+), 115 deletions(-)
arch/s390/kernel/debug.c renamed from arch/s390/kernel/debug.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -1
@@ -18,6 +18,7 @@#include <linux/errno.h> #include <linux/slab.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/sysctl.h> #include <asm/uaccess.h> #include <linux/module.h>
@@ -1178,7 +1179,7 @@ debug_get_uint(char *buf) {int rc; -for (;isspace (*buf); buf++); + buf =skip_spaces (buf); rc =simple_strtoul (buf, &buf,10 );if (*buf){ rc = -EINVAL ;
arch/um/drivers/mconsole_kern.c renamed from arch/um/drivers/mconsole_kern.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +7 -9
@@ -6,6 +6,7 @@#include <linux/console.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/interrupt.h> #include <linux/list.h> #include <linux/mm.h>
@@ -131,7 +132,7 @@ void mconsole_proc(struct mc_request *rechar *ptr = req->request.data, *buf; ptr +=strlen ("proc" ); -while (isspace (*ptr)) ptr++; + ptr =skip_spaces (ptr); proc =get_fs_type ("proc" );if (proc ==NULL ) {
@@ -212,8 +213,7 @@ void mconsole_proc(struct mc_request *rechar *ptr = req->request.data; ptr +=strlen ("proc" ); -while (isspace (*ptr)) - ptr++; + ptr =skip_spaces (ptr);snprintf (path,sizeof (path),"/proc/%s" , ptr); fd =sys_open (path,0 ,0 );
@@ -560,8 +560,7 @@ void mconsole_config(struct mc_request *int err; ptr +=strlen ("config" ); -while (isspace (*ptr)) - ptr++; + ptr =skip_spaces (ptr); dev =mconsole_find_dev (ptr);if (dev ==NULL ) {mconsole_reply (req,"Bad configuration option" ,1 ,0 );
@@ -588,7 +587,7 @@ void mconsole_remove(struct mc_request *int err, start, end, n; ptr +=strlen ("remove" ); -while (isspace (*ptr)) ptr++; + ptr =skip_spaces (ptr); dev =mconsole_find_dev (ptr);if (dev ==NULL ) {mconsole_reply (req,"Bad remove option" ,1 ,0 );
@@ -712,7 +711,7 @@ void mconsole_sysrq(struct mc_request *rchar *ptr = req->request.data; ptr +=strlen ("sysrq" ); -while (isspace (*ptr)) ptr++; + ptr =skip_spaces (ptr);/* * With 'b', the system will shut down without a chance to reply,
@@ -757,8 +756,7 @@ void mconsole_stack(struct mc_request *r*/ ptr +=strlen ("stack" ); -while (isspace (*ptr)) - ptr++; + ptr =skip_spaces (ptr);/* * Should really check for multiple pids or reject bad args here
arch/x86/kernel/cpu/mtrr/if.c renamed from arch/x86/kernel/cpu/mtrr/if.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +4 -7
@@ -4,6 +4,7 @@#include <linux/proc_fs.h> #include <linux/module.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/init.h> #define LINE_SIZE 80
@@ -133,8 +134,7 @@ mtrr_write(struct file *file, const charreturn -EINVAL ; base =simple_strtoull (line +5 , &ptr,0 ); -while (isspace (*ptr)) - ptr++; + ptr =skip_spaces (ptr);if (strncmp (ptr,"size=" ,5 ))return -EINVAL ;
@@ -142,14 +142,11 @@ mtrr_write(struct file *file, const char size =simple_strtoull (ptr +5 , &ptr,0 );if ((base &0xfff ) || (size &0xfff ))return -EINVAL ; -while (isspace (*ptr)) - ptr++; + ptr =skip_spaces (ptr);if (strncmp (ptr,"type=" ,5 ))return -EINVAL ; - ptr +=5 ; -while (isspace (*ptr)) - ptr++; + ptr =skip_spaces (ptr +5 );for (i =0 ; i <MTRR_NUM_TYPES ; ++i) {if (strcmp (ptr, mtrr_strings[i]))
drivers/leds/led-class.c renamed from drivers/leds/led-class.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +1 -1
@@ -50,7 +50,7 @@ static ssize_t led_brightness_store(struunsigned long state =simple_strtoul (buf, &after,10 );size_t count = after - buf; -if (*after &&isspace (*after)) +if (isspace (*after)) count++;if (count == size) {
drivers/leds/ledtrig-timer.c renamed from drivers/leds/ledtrig-timer.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -2
@@ -83,7 +83,7 @@ static ssize_t led_delay_on_store(structunsigned long state =simple_strtoul (buf, &after,10 );size_t count = after - buf; -if (*after &&isspace (*after)) +if (isspace (*after)) count++;if (count == size) {
@@ -127,7 +127,7 @@ static ssize_t led_delay_off_store(strucunsigned long state =simple_strtoul (buf, &after,10 );size_t count = after - buf; -if (*after &&isspace (*after)) +if (isspace (*after)) count++;if (count == size) {
drivers/md/dm-table.c renamed from drivers/md/dm-table.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -4
@@ -12,6 +12,7 @@#include <linux/blkdev.h> #include <linux/namei.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/mutex.h>
@@ -600,11 +601,8 @@ int dm_split_args(int *argc, char ***argreturn -ENOMEM ;while (1 ) { - start = end; -/* Skip whitespace */ -while (*start &&isspace (*start)) - start++; + start =skip_spaces (end);if (!*start)break ;/* success, we hit the end */
drivers/md/md.c renamed from drivers/md/md.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -2
@@ -39,6 +39,7 @@#include <linux/buffer_head.h> /* for invalidate_bdev */ #include <linux/poll.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/hdreg.h> #include <linux/proc_fs.h> #include <linux/random.h>
@@ -3246,8 +3247,7 @@ bitmap_store(mddev_t *mddev, const char }if (*end && !isspace (*end))break ;bitmap_dirty_bits (mddev->bitmap, chunk, end_chunk); - buf = end; -while (isspace (*buf)) buf++; + buf =skip_spaces (end); }bitmap_unplug (mddev->bitmap);/* flush the bits to disk */ out:
drivers/parisc/pdc_stable.c renamed from drivers/parisc/pdc_stable.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +3 -6
@@ -779,12 +779,9 @@ static ssize_t pdcs_auto_write(struct koread_unlock (&pathentry->rw_lock);DPRINTK ("%s: flags before: 0x%X\n" , __func__, flags); - - temp = in; - -while (*temp &&isspace (*temp)) - temp++; - + + temp =skip_spaces (in); + c = *temp++ -'0' ;if ((c !=0 ) && (c !=1 )) goto parse_error;
drivers/platform/x86/thinkpad_acpi.c renamed from drivers/platform/x86/thinkpad_acpi.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -5
@@ -1006,11 +1006,8 @@ static int parse_strtoul(const char *buf {char *endp; -while (*buf &&isspace (*buf)) - buf++; - *value =simple_strtoul (buf, &endp,0 ); -while (*endp &&isspace (*endp)) - endp++; + *value =simple_strtoul (skip_spaces (buf), &endp,0 ); + endp =skip_spaces (endp);if (*endp || *value > max)return -EINVAL ;
drivers/pnp/interface.c renamed from drivers/pnp/interface.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +10 -26
@@ -310,8 +310,7 @@ static ssize_t pnp_set_current_resources goto done; } -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf);if (!strnicmp (buf,"disable" ,7 )) { retval =pnp_disable_dev (dev); goto done;
@@ -353,19 +352,13 @@ static ssize_t pnp_set_current_resourcespnp_init_resources (dev);mutex_lock (&pnp_res_mutex);while (1 ) { -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf);if (!strnicmp (buf,"io" ,2 )) { - buf +=2 ; -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf +2 ); start =simple_strtoul (buf, &buf,0 ); -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf);if (*buf =='-' ) { - buf +=1 ; -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf +1 ); end =simple_strtoul (buf, &buf,0 ); }else end = start;
@@ -373,16 +366,11 @@ static ssize_t pnp_set_current_resourcescontinue ; }if (!strnicmp (buf,"mem" ,3 )) { - buf +=3 ; -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf +3 ); start =simple_strtoul (buf, &buf,0 ); -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf);if (*buf =='-' ) { - buf +=1 ; -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf +1 ); end =simple_strtoul (buf, &buf,0 ); }else end = start;
@@ -390,17 +378,13 @@ static ssize_t pnp_set_current_resourcescontinue ; }if (!strnicmp (buf,"irq" ,3 )) { - buf +=3 ; -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf +3 ); start =simple_strtoul (buf, &buf,0 );pnp_add_irq_resource (dev, start,0 );continue ; }if (!strnicmp (buf,"dma" ,3 )) { - buf +=3 ; -while (isspace (*buf)) - ++buf; + buf =skip_spaces (buf +3 ); start =simple_strtoul (buf, &buf,0 );pnp_add_dma_resource (dev, start,0 );continue ;
drivers/s390/block/dasd_proc.c renamed from drivers/s390/block/dasd_proc.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +3 -2
@@ -14,6 +14,7 @@#define KMSG_COMPONENT "dasd"#include <linux/ctype.h> +#include <linux/string.h> #include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/proc_fs.h>
@@ -272,10 +273,10 @@ dasd_statistics_write(struct file *file,DBF_EVENT (DBF_DEBUG ,"/proc/dasd/statictics: '%s'\n" , buffer);/* check for valid verbs */ -for (str = buffer;isspace (*str); str++); + str =skip_spaces (buffer);if (strncmp (str,"set" ,3 ) ==0 &&isspace (str[3 ])) {/* 'set xxx' was given */ -for (str = str +4 ;isspace (*str); str++); + str =skip_spaces (str +4 );if (strcmp (str,"on" ) ==0 ) {/* switch on statistics profiling */ dasd_profile_level =DASD_PROFILE_ON ;
drivers/video/backlight/lcd.c renamed from drivers/video/backlight/lcd.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -2
@@ -101,7 +101,7 @@ static ssize_t lcd_store_power(struct deint power =simple_strtoul (buf, &endp,0 );size_t size = endp - buf; -if (*endp &&isspace (*endp)) +if (isspace (*endp)) size++;if (size != count)return -EINVAL ;
@@ -140,7 +140,7 @@ static ssize_t lcd_store_contrast(structint contrast =simple_strtoul (buf, &endp,0 );size_t size = endp - buf; -if (*endp &&isspace (*endp)) +if (isspace (*endp)) size++;if (size != count)return -EINVAL ;
drivers/video/display/display-sysfs.c renamed from drivers/video/display/display-sysfs.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +1 -1
@@ -67,7 +67,7 @@ static ssize_t display_store_contrast(st contrast =simple_strtoul (buf, &endp,0 ); size = endp - buf; -if (*endp &&isspace (*endp)) +if (isspace (*endp)) size++;if (size != count)
drivers/video/output.c renamed from drivers/video/output.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +1 -1
@@ -50,7 +50,7 @@ static ssize_t video_output_store_state(int request_state =simple_strtoul (buf,&endp,0 );size_t size = endp - buf; -if (*endp &&isspace (*endp)) +if (isspace (*endp)) size++;if (size != count)return -EINVAL ;
fs/cachefiles/daemon.c renamed from fs/cachefiles/daemon.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -2
@@ -21,6 +21,7 @@#include <linux/mount.h> #include <linux/statfs.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/fs_struct.h> #include "internal.h"
@@ -257,8 +258,7 @@ static ssize_t cachefiles_daemon_write(sif (args == data) goto error; *args ='\0' ; -for (args++;isspace (*args); args++) -continue ; + args =skip_spaces (++args); }/* run the appropriate command handler */
fs/ext4/super.c renamed from fs/ext4/super.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -5
@@ -2137,11 +2137,8 @@ static int parse_strtoul(const char *buf {char *endp; -while (*buf &&isspace (*buf)) - buf++; - *value =simple_strtoul (buf, &endp,0 ); -while (*endp &&isspace (*endp)) - endp++; + *value =simple_strtoul (skip_spaces (buf), &endp,0 ); + endp =skip_spaces (endp);if (*endp || *value > max)return -EINVAL ;
kernel/params.c renamed from kernel/params.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +3 -5
@@ -24,6 +24,7 @@#include <linux/err.h> #include <linux/slab.h> #include <linux/ctype.h> +#include <linux/string.h> #if 0 #define DEBUGP printk
@@ -122,9 +123,7 @@ static char *next_arg(char *args, char * next = args + i;/* Chew up trailing spaces. */ -while (isspace (*next)) - next++; -return next; +return skip_spaces (next); }/* Args looks like "foo=bar,bar2 baz=fuz wiz". */
@@ -139,8 +138,7 @@ int parse_args(const char *name,DEBUGP ("Parsing ARGS: %s\n" , args);/* Chew leading spaces */ -while (isspace (*args)) - args++; + args =skip_spaces (args);while (*args) {int ret;
lib/argv_split.c renamed from lib/argv_split.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +3 -10
@@ -4,17 +4,10 @@#include <linux/kernel.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/slab.h> #include <linux/module.h> -static const char *skip_sep (const char *cp) -{ -while (*cp &&isspace (*cp)) - cp++; - -return cp; -} -static const char *skip_arg (const char *cp) {while (*cp && !isspace (*cp))
@@ -28,7 +21,7 @@ static int count_argc(const char *str)int count =0 ;while (*str) { - str =skip_sep (str); + str =skip_spaces (str);if (*str) { count++; str =skip_arg (str);
@@ -82,7 +75,7 @@ char **argv_split(gfp_t gfp, const char argvp = argv;while (*str) { - str =skip_sep (str); + str =skip_spaces (str);if (*str) {const char *p = str;
lib/dynamic_debug.c renamed from lib/dynamic_debug.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +2 -2
@@ -21,6 +21,7 @@#include <linux/list.h> #include <linux/sysctl.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/uaccess.h> #include <linux/dynamic_debug.h> #include <linux/debugfs.h>
@@ -209,8 +210,7 @@ static int ddebug_tokenize(char *buf, chchar *end;/* Skip leading whitespace */ -while (*buf &&isspace (*buf)) - buf++; + buf =skip_spaces (buf);if (!*buf)break ;/* oh, it was trailing whitespace */
lib/vsprintf.c renamed from lib/vsprintf.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +4 -11
@@ -1766,13 +1766,6 @@ EXPORT_SYMBOL_GPL(bprintf);#endif /* CONFIG_BINARY_PRINTF */ -static noinline char *skip_space(const char *str) -{ -while (isspace (*str)) - ++str; -return (char *)str; -} -/** * vsscanf - Unformat a buffer into a list of arguments * @buf: input buffer
@@ -1794,8 +1787,8 @@ int vsscanf(const char *buf, const char* white space, including none, in the input. */ if (isspace (*fmt)) { - fmt =skip_space (fmt); - str =skip_space (str); + fmt =skip_spaces (++fmt); + str =skip_spaces (str); }/* anything that is not a conversion must match exactly */
@@ -1865,7 +1858,7 @@ int vsscanf(const char *buf, const charif (field_width ==-1 ) field_width =INT_MAX ;/* first, skip leading white space in buffer */ - str =skip_space (str); + str =skip_spaces (str);/* now copy until next white space */ while (*str && !isspace (*str) && field_width--)
@@ -1907,7 +1900,7 @@ int vsscanf(const char *buf, const char/* have some sort of integer conversion. * first, skip white space in buffer. */ - str =skip_space (str); + str =skip_spaces (str); digit = *str;if (is_sign && digit =='-' )
net/irda/irnet/irnet.h renamed from net/irda/irnet/irnet.h~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +1 -0
@@ -249,6 +249,7 @@#include <linux/poll.h> #include <linux/capability.h> #include <linux/ctype.h> /* isspace() */ +#include <linux/string.h> /* skip_spaces() */ #include <asm/uaccess.h> #include <linux/init.h>
net/irda/irnet/irnet_ppp.c renamed from net/irda/irnet/irnet_ppp.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +3 -5
@@ -76,9 +76,8 @@ irnet_ctrl_write(irnet_socket * ap,/* Look at the next command */ start = next; -/* Scrap whitespaces before the command */ -while (isspace (*start)) - start++; +/* Scrap whitespaces before the command */ + start =skip_spaces (start);/* ',' is our command separator */ next =strchr (start,',' );
@@ -133,8 +132,7 @@ irnet_ctrl_write(irnet_socket * ap,char * endp;/* Scrap whitespaces before the command */ -while (isspace (*begp)) - begp++; + begp =skip_spaces (begp);/* Convert argument to a number (last arg is the base) */ addr =simple_strtoul (begp, &endp,16 );
net/netfilter/xt_recent.c renamed from net/netfilter/xt_recent.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +1 -2
@@ -482,8 +482,7 @@ static ssize_t recent_old_proc_write(strif (copy_from_user (buf, input, size))return -EFAULT ; -while (isspace (*c)) - c++; + c =skip_spaces (c);if (size - (c - buf) <5 )return c - buf;
sound/pci/hda/hda_hwdep.c renamed from sound/pci/hda/hda_hwdep.c~tree-wide-convert-open-calls-to-remove-spaces-to-skip_spaces-lib-function +3 -4
@@ -24,6 +24,7 @@#include <linux/compat.h> #include <linux/mutex.h> #include <linux/ctype.h> +#include <linux/string.h> #include <linux/firmware.h> #include <sound/core.h> #include "hda_codec.h"
@@ -428,8 +429,7 @@ static int parse_hints(struct hda_codecchar *key, *val;struct hda_hint *hint; -while (isspace (*buf)) - buf++; + buf =skip_spaces (buf);if (!*buf || *buf =='#' || *buf =='\n' )return 0 ;if (*buf =='=' )
@@ -444,8 +444,7 @@ static int parse_hints(struct hda_codecreturn -EINVAL ; } *val++ =0 ; -while (isspace (*val)) - val++; + val =skip_spaces (val);remove_trail_spaces (key);remove_trail_spaces (val); hint =get_hint (codec, key);
_
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html