 e7d2860b69
			
		
	
	
	e7d2860b69
	
	
	
		
			
			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>
		
			
				
	
	
		
			101 lines
		
	
	
	
		
			1.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			101 lines
		
	
	
	
		
			1.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Helper function for splitting a string into an argv-like array.
 | |
|  */
 | |
| 
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/ctype.h>
 | |
| #include <linux/string.h>
 | |
| #include <linux/slab.h>
 | |
| #include <linux/module.h>
 | |
| 
 | |
| static const char *skip_arg(const char *cp)
 | |
| {
 | |
| 	while (*cp && !isspace(*cp))
 | |
| 		cp++;
 | |
| 
 | |
| 	return cp;
 | |
| }
 | |
| 
 | |
| static int count_argc(const char *str)
 | |
| {
 | |
| 	int count = 0;
 | |
| 
 | |
| 	while (*str) {
 | |
| 		str = skip_spaces(str);
 | |
| 		if (*str) {
 | |
| 			count++;
 | |
| 			str = skip_arg(str);
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return count;
 | |
| }
 | |
| 
 | |
| /**
 | |
|  * argv_free - free an argv
 | |
|  * @argv - the argument vector to be freed
 | |
|  *
 | |
|  * Frees an argv and the strings it points to.
 | |
|  */
 | |
| void argv_free(char **argv)
 | |
| {
 | |
| 	char **p;
 | |
| 	for (p = argv; *p; p++)
 | |
| 		kfree(*p);
 | |
| 
 | |
| 	kfree(argv);
 | |
| }
 | |
| EXPORT_SYMBOL(argv_free);
 | |
| 
 | |
| /**
 | |
|  * argv_split - split a string at whitespace, returning an argv
 | |
|  * @gfp: the GFP mask used to allocate memory
 | |
|  * @str: the string to be split
 | |
|  * @argcp: returned argument count
 | |
|  *
 | |
|  * Returns an array of pointers to strings which are split out from
 | |
|  * @str.  This is performed by strictly splitting on white-space; no
 | |
|  * quote processing is performed.  Multiple whitespace characters are
 | |
|  * considered to be a single argument separator.  The returned array
 | |
|  * is always NULL-terminated.  Returns NULL on memory allocation
 | |
|  * failure.
 | |
|  */
 | |
| char **argv_split(gfp_t gfp, const char *str, int *argcp)
 | |
| {
 | |
| 	int argc = count_argc(str);
 | |
| 	char **argv = kzalloc(sizeof(*argv) * (argc+1), gfp);
 | |
| 	char **argvp;
 | |
| 
 | |
| 	if (argv == NULL)
 | |
| 		goto out;
 | |
| 
 | |
| 	if (argcp)
 | |
| 		*argcp = argc;
 | |
| 
 | |
| 	argvp = argv;
 | |
| 
 | |
| 	while (*str) {
 | |
| 		str = skip_spaces(str);
 | |
| 
 | |
| 		if (*str) {
 | |
| 			const char *p = str;
 | |
| 			char *t;
 | |
| 
 | |
| 			str = skip_arg(str);
 | |
| 
 | |
| 			t = kstrndup(p, str-p, gfp);
 | |
| 			if (t == NULL)
 | |
| 				goto fail;
 | |
| 			*argvp++ = t;
 | |
| 		}
 | |
| 	}
 | |
| 	*argvp = NULL;
 | |
| 
 | |
|   out:
 | |
| 	return argv;
 | |
| 
 | |
|   fail:
 | |
| 	argv_free(argv);
 | |
| 	return NULL;
 | |
| }
 | |
| EXPORT_SYMBOL(argv_split);
 |