aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Goddard Rosa <andre.goddard@gmail.com>2009-12-14 18:01:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:53:33 -0800
commitb5f54b07c06f6e438a4fee92c27423e880d8816b (patch)
treed1bac8b28c77f1b646dde9779eba73d927d269f7
parente7d2860b690d4f3bed6824757c540579638e3d1e (diff)
parser: remove unnecessary strlen()
No functional change. Cache strlen() result to avoid recalculating it up to 3 times on the worst case. Reduces code size a little by 32 bytes: text data bss dec hex filename 1385 0 0 1385 569 lib/parser.o-BEFORE 1353 0 0 1353 549 lib/parser.o-AFTER Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--lib/parser.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/parser.c b/lib/parser.c
index b00d02059a5..fb34977246b 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -56,13 +56,16 @@ static int match_one(char *s, const char *p, substring_t args[])
args[argc].from = s;
switch (*p++) {
- case 's':
- if (strlen(s) == 0)
+ case 's': {
+ size_t str_len = strlen(s);
+
+ if (str_len == 0)
return 0;
- else if (len == -1 || len > strlen(s))
- len = strlen(s);
+ if (len == -1 || len > str_len)
+ len = str_len;
args[argc].to = s + len;
break;
+ }
case 'd':
simple_strtol(s, &args[argc].to, 0);
goto num;