From 938c29ff41b40a1b6cafc9bcc81b89ad2bd537ba Mon Sep 17 00:00:00 2001 From: Andreas Fenkart Date: Fri, 11 Mar 2016 09:39:37 +0100 Subject: tools: env: split fw_string_blank into skip_chars / skip_blanks Signed-off-by: Andreas Fenkart --- tools/env/fw_env.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'tools') diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 0a438a3be4..60574f249d 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -133,14 +133,19 @@ static inline ulong getenvsize (void) return rc; } -static char *fw_string_blank(char *s, int noblank) +static char *skip_chars(char *s) { - int i; - int len = strlen(s); + for (; *s != '\0'; s++) { + if (isblank(*s)) + return s; + } + return NULL; +} - for (i = 0; i < len; i++, s++) { - if ((noblank && !isblank(*s)) || - (!noblank && isblank(*s))) +static char *skip_blanks(char *s) +{ + for (; *s != '\0'; s++) { + if (!isblank(*s)) return s; } return NULL; @@ -575,17 +580,17 @@ int fw_parse_script(char *fname) * Search for variable's name, * remove leading whitespaces */ - name = fw_string_blank(dump, 1); + name = skip_blanks(dump); if (!name) continue; /* The first white space is the end of variable name */ - val = fw_string_blank(name, 0); + val = skip_chars(name); len = strlen(name); if (val) { *val++ = '\0'; if ((val - name) < len) - val = fw_string_blank(val, 1); + val = skip_blanks(val); else val = NULL; } -- cgit v1.2.1