From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 16 Feb 2020 18:06:42 +0000 (+0100)
Subject: ash: shell: Fix clang warnings about "string plus integer"
X-Git-Tag: 1_32_0~71
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f4847b6d9198a359e98933271af4630b3c41f0a;p=oweals%2Fbusybox.git

ash: shell: Fix clang warnings about "string plus integer"

Upstream commit:

    Date: Sat, 15 Dec 2018 18:49:31 +0100
    shell: Fix clang warnings about "string plus integer"

    Building with clang results in some warnings about integer values being
    added to strings.

    While the code itself is fine and the warnings are indeed harmless,
    fixing them also makes the semantic more explicit: what it is actually
    being increased is the address which points to the start of the string
    in order to skip the initial character when some conditions are met.

    Signed-off-by: Antonio Ospite <ao2@ao2.it>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/ash.c b/shell/ash.c
index a43b65680..a25d14de0 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -4799,7 +4799,8 @@ cmdputs(const char *s)
 				str = "${";
 			goto dostr;
 		case CTLENDVAR:
-			str = "\"}" + !(quoted & 1);
+			str = "\"}";
+			str += !(quoted & 1);
 			quoted >>= 1;
 			subtype = 0;
 			goto dostr;