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>
This commit is contained in:
Denys Vlasenko 2020-02-16 19:06:42 +01:00
parent e368d851e7
commit 3f4847b6d9

View File

@ -4799,7 +4799,8 @@ cmdputs(const char *s)
str = "${"; str = "${";
goto dostr; goto dostr;
case CTLENDVAR: case CTLENDVAR:
str = "\"}" + !(quoted & 1); str = "\"}";
str += !(quoted & 1);
quoted >>= 1; quoted >>= 1;
subtype = 0; subtype = 0;
goto dostr; goto dostr;