8000 bpo-39943: Add the const qualifier to pointers on non-mutable PyBytes… · python/cpython@8f87eef · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f87eef

Browse files
serhiy-storchakaserhiy-storchaka
authored
bpo-39943: Add the const qualifier to pointers on non-mutable PyBytes data. (GH-19472)
1 parent 3e0dd37 commit 8f87eef

File tree

20 files changed

+38
-37
lines changed

20 files changed

+38
-37
lines changed

‎Modules/_ctypes/_ctypes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ CharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
13101310
static int
13111311
CharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
13121312
{
1313-
char *ptr;
1313+
const char *ptr;
13141314
Py_ssize_t size;
13151315

13161316
if (value == NULL) {

‎Modules/_ctypes/callproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
13841384
static PyObject *py_dl_open(PyObject *self, PyObject *args)
13851385
{
13861386
PyObject *name, *name2;
1387-
char *name_str;
1387+
const char *name_str;
13881388
void * handle;
13891389
#if HAVE_DECL_RTLD_LOCAL
13901390
int mode = RTLD_NOW | RTLD_LOCAL;

‎Modules/_ctypes/cfield.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ s_get(void *ptr, Py_ssize_t size)
12831283
static PyObject *
12841284
s_set(void *ptr, PyObject *value, Py_ssize_t length)
12851285
{
1286-
char *data;
1286+
const char *data;
12871287
Py_ssize_t size;
12881288

12891289
if(!PyBytes_Check(value)) {
@@ -1321,7 +1321,7 @@ z_set(void *ptr, PyObject *value, Py_ssize_t size)
13211321
return value;
13221322
}
13231323
if (PyBytes_Check(value)) {
1324-
*(char **)ptr = PyBytes_AsString(value);
1324+
*(const char **)ptr = PyBytes_AsString(value);
13251325
Py_INCREF(value);
13261326
return value;
13271327
} else if (PyLong_Check(value)) {

‎Modules/_cursesmodule.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
709709
else
710710
#endif
711711
{
712-
char *str = PyBytes_AS_STRING(bytesobj);
712+
const char *str = PyBytes_AS_STRING(bytesobj);
713713
funcname = "addstr";
714714
if (use_xy)
715715
rtn = mvwaddstr(self->win,y,x,str);
@@ -792,7 +792,7 @@ _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,
792792
else
793793
#endif
794794
{
795-
char *str = PyBytes_AS_STRING(bytesobj);
795+
const char *str = PyBytes_AS_STRING(bytesobj);
796796
funcname = "addnstr";
797797
if (use_xy)
798798
rtn = mvwaddnstr(self->win,y,x,str,n);
@@ -1710,7 +1710,7 @@ _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,
17101710
else
17111711
#endif
17121712
{
1713-
char *str = PyBytes_AS_STRING(bytesobj);
1713+
const char *str = PyBytes_AS_STRING(bytesobj);
17141714
funcname = "insstr";
17151715
if (use_xy)
17161716
rtn = mvwinsstr(self->win,y,x,str);
@@ -1795,7 +1795,7 @@ _curses_window_insnstr_impl(PyCursesWindowObject *self, int group_left_1,
17951795
else
17961796
#endif
17971797
{
1798-
char *str = PyBytes_AS_STRING(bytesobj);
1798+
const char *str = PyBytes_AS_STRING(bytesobj);
17991799
funcname = "insnstr";
18001800
if (use_xy)
18011801
rtn = mvwinsnstr(self->win,y,x,str,n);

‎Modules/_elementtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ checkpath(PyObject* tag)
11531153
return 0;
11541154
}
11551155
if (PyBytes_Check(tag)) {
1156-
char *p = PyBytes_AS_STRING(tag);
1156+
const char *p = PyBytes_AS_STRING(tag);
11571157
const Py_ssize_t len = PyBytes_GET_SIZE(tag);
11581158
if (len >= 3 && p[0] == '{' && (
11591159
p[1] == '}' || (p[1] == '*' && p[2] == '}'))) {

‎Modules/_io/bytesio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ _io_BytesIO_tell_impl(bytesio *self)
393393
static PyObject *
394394
read_bytes(bytesio *self, Py_ssize_t size)
395395
{
396-
char *output;
396+
const char *output;
397397

398398
assert(self->buf != NULL);
399399
assert(size <= self->string_size);
@@ -502,7 +502,7 @@ _io_BytesIO_readlines_impl(bytesio *self, PyObject *arg)
502502
{
503503
Py_ssize_t maxsize, size, n;
504504
PyObject *result, *line;
505-
char *output;
505+
const char *output;
506506

507507
CHECK_CLOSED(self);
508508

‎Modules/_io/textio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2640,7 +2640,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
26402640
Py_ssize_t chars_to_skip, chars_decoded;
26412641
Py_ssize_t skip_bytes, skip_back;
26422642
PyObject *saved_state = NULL;
2643-
char *input, *input_end;
2643+
const char *input, *input_end;
26442644
Py_ssize_t dec_buffer_len;
26452645
int dec_flags;
26462646

‎Modules/_localemodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ PyDoc_STRVAR(bindtextdomain__doc__,
637637
static PyObject*
638638
PyIntl_bindtextdomain(PyObject* self, PyObject*args)
639639
{
640-
char *domain, *dirname, *current_dirname;
640+
const char *domain, *dirname, *current_dirname;
641641
PyObject *dirname_obj, *dirname_bytes = NULL, *result;
642642

643643
if (!PyArg_ParseTuple(args, "sO", &domain, &dirname_obj))

‎Modules/_sqlite/connection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
7979
NULL
8080
};
8181

82-
char* database;
82+
const char* database;
8383
PyObject* database_obj;
8484
int detect_types = 0;
8585
PyObject* isolation_level = NULL;

‎Modules/_ssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4037,7 +4037,7 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
40374037
/* internal helper function, returns -1 on error
40384038
*/
40394039
static int
4040-
_add_ca_certs(PySSLContext *self, void *data, Py_ssize_t len,
4040+
_add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
40414041
int filetype)
40424042
{
40434043
BIO *biobuf = NULL;

‎Modules/_struct.c

Lines changed: 2 additions & 2 deletions
2851
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ s_pack_internal(PyStructObject *soself, PyObject *const *args, int offset, char*
17851785
if (e->format == 's') {
17861786
Py_ssize_t n;
17871787
int isstring;
1788-
void *p;
1788+
const void *p;
17891789
isstring = PyBytes_Check(v);
17901790
if (!isstring && !PyByteArray_Check(v)) {
17911791
PyErr_SetString(_structmodulestate_global->StructError,
@@ -1807,7 +1807,7 @@ s_pack_internal(PyStructObject *soself, PyObject *const *args, int offset, char*
18071807
} else if (e->format == 'p') {
18081808
Py_ssize_t n;
18091809
int isstring;
1810-
void *p;
1810+
const void *p;
18111811
isstring = PyBytes_Check(v);
18121812
if (!isstring && !PyByteArray_Check(v)) {
18131813
PyErr_SetString(_structmodulestate_global->StructError,

‎Modules/_tkinter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,9 @@ SplitObj(PyObject *arg)
574574
else if (PyBytes_Check(arg)) {
575575
int argc;
576576
const char **argv;
577-
char *list = PyBytes_AS_STRING(arg);
577+
const char *list = PyBytes_AS_STRING(arg);
578578

579-
if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
579+
if (Tcl_SplitList((Tcl_Interp *)NULL, (char *)list, &argc, &argv) != TCL_OK) {
580580
Py_INCREF(arg);
581581
return arg;
582582
}

‎Modules/cjkcodecs/multibytecodec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ _multibytecodec_MultibyteIncrementalDecoder_setstate_impl(MultibyteIncrementalDe
12461246
PyObject *buffer;
12471247
PyLongObject *statelong;
12481248
Py_ssize_t buffersize;
1249-
char *bufferstr;
1249+
const char *bufferstr;
12501250
unsigned char statebytes[8];
12511251

12521252
if (!PyArg_ParseTuple(state, "SO!;setstate(): illegal state argument",

‎Modules/readline.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static PyObject *
234234
write_history_file(PyObject *self, PyObject *args)
235235
{
236236
PyObject *filename_obj = Py_None, *filename_bytes;
237-
char *filename;
237+
const char *filename;
238238
int err;
239239
if (!PyArg_ParseTuple(args, "|O:write_history_file", &filename_obj))
240240
return NULL;
@@ -270,7 +270,7 @@ append_history_file(PyObject *self, PyObject *args)
270270
{
271271
int nelements;
272272
PyObject *filename_obj = Py_None, *filename_bytes;
273-
char *filename;
273+
const char *filename;
274274
int err;
275275
if (!PyArg_ParseTuple(args, "i|O:append_history_file", &nelements, &filename_obj))
276276
return NULL;

‎Objects/bytesobject.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,7 @@ bytes_subscript(PyBytesObject* self, PyObject* item)
15981598
else if (PySlice_Check(item)) {
15991599
Py_ssize_t start, stop, step, slicelength, i;
16001600
size_t cur;
1601-
char* source_buf;
1601+
const char* source_buf;
16021602
char* result_buf;
16031603
PyObject* result;
16041604

@@ -1863,7 +1863,7 @@ Py_LOCAL_INLINE(PyObject *)
18631863
do_xstrip(PyBytesObject *self, int striptype, PyObject *sepobj)
18641864
{
18651865
Py_buffer vsep;
1866-
char *s = PyBytes_AS_STRING(self);
1866+
const char *s = PyBytes_AS_STRING(self);
18671867
Py_ssize_t len = PyBytes_GET_SIZE(self);
18681868
char *sep;
18691869
Py_ssize_t seplen;
@@ -1903,7 +1903,7 @@ do_xstrip(PyBytesObject *self, int striptype, PyObject *sepobj)
19031903
Py_LOCAL_INLINE(PyObject *)
19041904
do_strip(PyBytesObject *self, int striptype)
19051905
{
1906-
char *s = PyBytes_AS_STRING(self);
1906+
const char *s = PyBytes_AS_STRING(self);
19071907
Py_ssize_t len = PyBytes_GET_SIZE(self), i, j;
19081908

19091909
i = 0;
@@ -2020,7 +2020,8 @@ bytes_translate_impl(PyBytesObject *self, PyObject *table,
20202020
PyObject *deletechars)
20212021
/*[clinic end generated code: output=43be3437f1956211 input=0ecdf159f654233c]*/
20222022
{
2023-
char *input, *output;
2023+
const char *input;
2024+
char *output;
20242025
Py_buffer table_view = {NULL, NULL};
20252026
Py_buffer del_table_view = {NULL, NULL};
20262027
const char *table_chars;
@@ -2371,7 +2372,7 @@ static PyObject *
23712372
bytes_hex_impl(PyBytesObject *self, PyObject *sep, int bytes_per_sep)
23722373
/*[clinic end generated code: output=1f134da504064139 input=f1238d3455990218]*/
23732374
{
2374-
char* argbuf = PyBytes_AS_STRING(self);
2375+
const char *argbuf = PyBytes_AS_STRING(self);
23752376
Py_ssize_t arglen = PyBytes_GET_SIZE(self);
23762377
return _Py_strhex_with_sep(argbuf, arglen, sep, bytes_per_sep);
23772378
}
@@ -3188,7 +3189,7 @@ _PyBytesWriter_AsString(_PyBytesWriter *writer)
31883189
Py_LOCAL_INLINE(Py_ssize_t)
31893190
_PyBytesWriter_GetSize(_PyBytesWriter *writer, char *str)
31903191
{
3191-
char *start = _PyBytesWriter_AsString(writer);
3192+
const char *start = _PyBytesWriter_AsString(writer);
31923193
assert(str != NULL);
31933194
assert(str >= start);
31943195
assert(str - start <= writer->allocated);
@@ -3199,7 +3200,7 @@ _PyBytesWriter_GetSize(_PyBytesWriter *writer, char *str)
31993200
Py_LOCAL_INLINE(int)
32003201
_PyBytesWriter_CheckConsistency(_PyBytesWriter *writer, char *str)
32013202
{
3202-
char *start, *end;
3203+
const char *start, *end;
32033204

32043205
if (writer->use_small_buffer) {
32053206
assert(writer->buffer == NULL);

‎Objects/fileobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ PyFile_GetLine(PyObject *f, int n)
7676
}
7777

7878
if (n < 0 && result != NULL && PyBytes_Check(result)) {
79-
char *s = PyBytes_AS_STRING(result);
79+
const char *s = PyBytes_AS_STRING(result);
8080
Py_ssize_t len = PyBytes_GET_SIZE(result);
8181
if (len == 0) {
8282
Py_DECREF(result);

‎Objects/longobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5071,7 +5071,7 @@ long_new_impl(PyTypeObject *type, PyObject *x, PyObject *obase)
50715071
if (PyUnicode_Check(x))
50725072
return PyLong_FromUnicodeObject(x, (int)base);
50735073
else if (PyByteArray_Check(x) || PyBytes_Check(x)) {
5074-
char *string;
5074+
const char *string;
50755075
if (PyByteArray_Check(x))
50765076
string = PyByteArray_AS_STRING(x);
50775077
else

‎Objects/stringlib/join.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
Py_LOCAL_INLINE(PyObject *)
88
STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
99
{
10-
char *sepstr = STRINGLIB_STR(sep);
11-
const Py_ssize_t seplen = STRINGLIB_LEN(sep);
10+
const char *sepstr = STRINGLIB_STR(sep);
11+
Py_ssize_t seplen = STRINGLIB_LEN(sep);
1212
PyObject *res = NULL;
1313
char *p;
1414
Py_ssize_t seqlen = 0;

‎Objects/unicodeobject.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3887,7 +3887,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
38873887
PyObject *path = NULL;
38883888
PyObject *output = NULL;
38893889
Py_ssize_t size;
3890-
void *data;
3890+
const char *data;
38913891
if (arg == NULL) {
38923892
Py_DECREF(*(PyObject**)addr);
38933893
*(PyObject**)addr = NULL;
@@ -4718,7 +4718,7 @@ _PyUnicode_EncodeUTF7(PyObject *str,
47184718
unsigned int base64bits = 0;
47194719
unsigned long base64buffer = 0;
47204720
char * out;
4721-
char * start;
4721+
const char * start;
47224722

47234723
if (PyUnicode_READY(str) == -1)
47244724
return NULL;
@@ -5446,7 +5446,7 @@ unicode_fill_utf8(PyObject *unicode)
54465446
return -1;
54475447
}
54485448

5449-
char *start = writer.use_small_buffer ? writer.small_buffer :
5449+
const char *start = writer.use_small_buffer ? writer.small_buffer :
54505450
PyBytes_AS_STRING(writer.buffer);
54515451
Py_ssize_t len = end - start;
54525452

‎Python/fileutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ _Py_fopen_obj(PyObject *path, const char *mode)
14521452
&& errno == EINTR && !(async_err = PyErr_CheckSignals()));
14531453
#else
14541454
PyObject *bytes;
1455-
char *path_bytes;
1455+
const char *path_bytes;
14561456

14571457
assert(PyGILState_Check());
14581458

0 commit comments

Comments
 (0)
0