From: Sven Schwermer <sven.schwermer@disruptive-technologies.com>
Date: Thu, 27 May 2021 06:33:08 +0000 (+0200)
Subject: mkerr: Fix string literal conversion
X-Git-Tag: openssl-3.0.0-beta1~333
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5642882f11b0ca6b026b20775c0cddf4a29bc26c;p=thirdparty%2Fopenssl.git

mkerr: Fix string literal conversion

This fixes a compiler warning on clang-1205.0.22.9 when compiling the
generated code as C++11:

ISO C++11 does not allow conversion from string literal to 'char *'
[-Wwritable-strings]

CLA: trivial

Signed-off-by: Sven Schwermer <sven.schwermer@disruptive-technologies.com>

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15495)
---

diff --git a/util/mkerr.pl b/util/mkerr.pl
index ab25b8fc96a..1cb772c00f1 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -459,7 +459,7 @@ extern \"C\" {
 # endif
 int ERR_load_${lib}_strings(void);
 void ERR_unload_${lib}_strings(void);
-void ERR_${lib}_error(int function, int reason, char *file, int line);
+void ERR_${lib}_error(int function, int reason, const char *file, int line);
 # ifdef  __cplusplus
 }
 # endif
@@ -621,7 +621,7 @@ ${st}void ERR_unload_${lib}_strings(void)
     }
 }
 
-${st}void ERR_${lib}_error(int function, int reason, char *file, int line)
+${st}void ERR_${lib}_error(int function, int reason, const char *file, int line)
 {
     if (lib_code == 0)
         lib_code = ERR_get_next_error_library();