commit 0d860dd43c72dc7046a5d18fc72d495cadd4a2df
author Benjamin Peterson <benjamin@python.org> Thu Feb 13 21:05:00 2020 -0800
committer GitHub <noreply@github.com> Thu Feb 13 21:05:00 2020 -0800
tree fe13da348427ff9ffb9c6ceb10cd0c291a0b733e
parent 28fc1bac0fbe1f4ae2e3dcba1dee38d2c063a539

[3.8] closes bpo-39630: Update pointers to string literals to be const char *. (GH-18511)

(cherry picked from commit 7386a70746cf9aaf2d95db75d9201fb124f085df)

Co-authored-by: Andy Lester <andy@petdance.com>

Objects/genobject.c

diff --git a/Objects/genobject.c b/Objects/genobject.c
index 2c06bdc..ce7dd48 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -11,10 +11,10 @@
 static PyObject *async_gen_asend_new(PyAsyncGenObject *, PyObject *);
 static PyObject *async_gen_athrow_new(PyAsyncGenObject *, PyObject *);
 
-static char *NON_INIT_CORO_MSG = "can't send non-None value to a "
+static const char *NON_INIT_CORO_MSG = "can't send non-None value to a "
                                  "just-started coroutine";
 
-static char *ASYNC_GEN_IGNORED_EXIT_MSG =
+static const char *ASYNC_GEN_IGNORED_EXIT_MSG =
                                  "async generator ignored GeneratorExit";
 
 static inline int

Python/codecs.c

diff --git a/Python/codecs.c b/Python/codecs.c
index d4b34f8..4bd28ec 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -1415,7 +1415,7 @@
 static int _PyCodecRegistry_Init(void)
 {
     static struct {
-        char *name;
+        const char *name;
         PyMethodDef def;
     } methods[] =
     {

Python/errors.c

diff --git a/Python/errors.c b/Python/errors.c
index 197d977..1360c0d 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -584,7 +584,7 @@
 
 #ifndef MS_WINDOWS
     if (i != 0) {
-        char *s = strerror(i);
+        const char *s = strerror(i);
         message = PyUnicode_DecodeLocale(s, "surrogateescape");
     }
     else {