diff options
| author | Andy Lester <andy@petdance.com> | 2020-02-14 04:42:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 04:42:56 (GMT) |
| commit | 7386a70746cf9aaf2d95db75d9201fb124f085df (patch) | |
| tree | ad8f8bf74a24ef84d9070da6f1f7b55d36f880eb | |
| parent | a9edf44a2de9b23a1690b36cdfeed7b41ab763bd (diff) | |
| download | cpython-7386a70746cf9aaf2d95db75d9201fb124f085df.zip cpython-7386a70746cf9aaf2d95db75d9201fb124f085df.tar.gz cpython-7386a70746cf9aaf2d95db75d9201fb124f085df.tar.bz2 | |
closes bpo-39630: Update pointers to string literals to be const char *. (GH-18510)
| -rw-r--r-- | Objects/frameobject.c | 2 | ||||
| -rw-r--r-- | Objects/genobject.c | 4 | ||||
| -rw-r--r-- | Python/codecs.c | 2 | ||||
| -rw-r--r-- | Python/errors.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 4469e3c..64f5754 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -475,7 +475,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore if (new_stack.depth > current_stack.depth || top_block(&new_stack)->start_line != current_block_at_new_depth->start_line) { unsigned char target_kind = top_block(&new_stack)->kind; - char *msg; + const char *msg; if (target_kind == POP_EXCEPT) { msg = "can't jump into an 'except' block as there's no exception"; } diff --git a/Objects/genobject.c b/Objects/genobject.c index 0837698..ef892bb 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -12,10 +12,10 @@ static PyObject *gen_close(PyGenObject *, PyObject *); 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 diff --git a/Python/codecs.c b/Python/codecs.c index ce86cb2..e5bcdb0 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -1407,7 +1407,7 @@ static PyObject *surrogateescape_errors(PyObject *self, PyObject *exc) static int _PyCodecRegistry_Init(void) { static struct { - char *name; + const char *name; PyMethodDef def; } methods[] = { diff --git a/Python/errors.c b/Python/errors.c index f11b66e..61dc597 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -614,7 +614,7 @@ PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, P #ifndef MS_WINDOWS if (i != 0) { - char *s = strerror(i); + const char *s = strerror(i); message = PyUnicode_DecodeLocale(s, "surrogateescape"); } else { |