[U-Boot] [PATCH 4/6] tools: env: fw_parse_script: simplify removal of newline/carriage return
Andreas Fenkart
andreas.fenkart at digitalstrom.com
Fri Mar 11 09:39:38 CET 2016
fgets returns when the first '\n' is found
Signed-off-by: Andreas Fenkart <andreas.fenkart at digitalstrom.com>
---
tools/env/fw_env.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 60574f2..5c7505c 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -566,14 +566,12 @@ int fw_parse_script(char *fname)
}
/* Drop ending line feed / carriage return */
- while (len > 0 && (dump[len - 1] == '\n' ||
- dump[len - 1] == '\r')) {
- dump[len - 1] = '\0';
- len--;
- }
+ dump[--len] = '\0';
+ if (len && dump[len - 1] == '\r')
+ dump[--len] = '\0';
/* Skip comment or empty lines */
- if ((len == 0) || dump[0] == '#')
+ if (len == 0 || dump[0] == '#')
continue;
/*
--
2.7.0
More information about the U-Boot
mailing list