From b1260553be842dd82b0b022dd40a22527d3e3659 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Tue, 7 Mar 2017 16:01:09 -0800 Subject: src/include: Move assignment out of if condition Fix the following error detected by checkpatch.pl: ERROR: do not use assignment in if condition TEST=Build and run on Galileo Gen2 Change-Id: I911d528bd85afcd9f3837241494f13d1f9f283ab Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/18659 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/include/string.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/include') diff --git a/src/include/string.h b/src/include/string.h index a000e6cb62..7597323c47 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -69,10 +69,13 @@ static inline char *strconcat(const char *s1, const char *s2) static inline char *strncpy(char *to, const char *from, int count) { register char *ret = to; + register char data; while (count > 0) { count--; - if ((*to++ = *from++) == '\0') + data = *from++; + *to++ = data; + if (data == '\0') break; } -- cgit v1.2.3