From: Patrick Steuer <patrick.steuer@de.ibm.com>
Date: Thu, 15 Aug 2019 21:13:53 +0000 (+0200)
Subject: Fix --strict-warnings build
X-Git-Tag: OpenSSL_1_1_1e~151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d7990451b4e69ac179a134c69551e557633c709;p=oweals%2Fopenssl.git

Fix --strict-warnings build

Appease -Wstring-plus-int.

Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9608)

(cherry picked from commit e0249827b3fa81ff6c59fb14ef85d38361dd5e31)
---

diff --git a/test/test_test.c b/test/test_test.c
index 0af2eaeb8a..74a230c196 100644
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -491,7 +491,7 @@ static int test_single_eval(void)
            && TEST_ptr_eq(p, buf + 1)
            && TEST_ptr_null(p = NULL)
            /* strings */
-           && TEST_str_eq(p = "123456" + 1, "23456")
+           && TEST_str_eq(p = &("123456"[1]), "23456")
            && TEST_str_eq("3456", ++p)
            && TEST_str_ne(p++, "456")
            /* memory */