FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-39943: Add the const qualifier to pointers on non-mutable PyUnico… · python/cpython@cd8295f · GitHub

/ cpython Public

Commit cd8295f

Browse files
serhiy-storchaka
authored
bpo-39943: Add the const qualifier to pointers on non-mutable PyUnicode data. (GH-19345)
1 parent 7ec43a7 commit cd8295f

27 files changed

Lines changed: 250 additions & 221 deletions

‎Modules/_csv.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ Reader_iternext(ReaderObj *self)
789789
Py_UCS4 c;
790790
Py_ssize_t pos, linelen;
791791
unsigned int kind;
792-
void *data;
792+
const void *data;
793793
PyObject *lineobj;
794794

795795
if (parse_reset(self) < 0)
@@ -996,7 +996,7 @@ join_reset(WriterObj *self)
996996
* record length.
997997
*/
998998
static Py_ssize_t
999-
join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
999+
join_append_data(WriterObj *self, unsigned int field_kind, const void *field_data,
10001000
Py_ssize_t field_len, int *quoted,
10011001
int copy_phase)
10021002
{
@@ -1107,7 +1107,7 @@ static int
11071107
join_append(WriterObj *self, PyObject *field, int quoted)
11081108
{
11091109
unsigned int field_kind = -1;
1110-
void *field_data = NULL;
1110+
const void *field_data = NULL;
11111111
Py_ssize_t field_len = 0;
11121112
Py_ssize_t rec_len;
11131113

@@ -1139,7 +1139,7 @@ join_append_lineterminator(WriterObj *self)
11391139
{
11401140
Py_ssize_t terminator_len, i;
11411141
unsigned int term_kind;
1142-
void *term_data;
1142+
const void *term_data;
11431143

11441144
terminator_len = PyUnicode_GET_LENGTH(self->dialect->lineterminator);
11451145
if (terminator_len == -1)

‎Modules/_decimal/_decimal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@ dec_dealloc(PyObject *dec)
18781878
/******************************************************************************/
18791879

18801880
Py_LOCAL_INLINE(int)
1881-
is_space(enum PyUnicode_Kind kind, void *data, Py_ssize_t pos)
1881+
is_space(enum PyUnicode_Kind kind, const void *data, Py_ssize_t pos)
18821882
{
18831883
Py_UCS4 ch = PyUnicode_READ(kind, data, pos);
18841884
return Py_UNICODE_ISSPACE(ch);
@@ -1896,7 +1896,7 @@ static char *
18961896
numeric_as_ascii(const PyObject *u, int strip_ws, int ignore_underscores)
18971897
{
18981898
enum PyUnicode_Kind kind;
1899-
void *data;
1899+
const void *data;
19001900
Py_UCS4 ch;
19011901
char *res, *cp;
19021902
Py_ssize_t j, len;

‎Modules/_elementtree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ checkpath(PyObject* tag)
11321132

11331133
if (PyUnicode_Check(tag)) {
11341134
const Py_ssize_t len = PyUnicode_GET_LENGTH(tag);
1135-
void *data = PyUnicode_DATA(tag);
1135+
const void *data = PyUnicode_DATA(tag);
11361136
unsigned int kind = PyUnicode_KIND(tag);
11371137
if (len >= 3 && PyUnicode_READ(kind, data, 0) == '{' && (
11381138
PyUnicode_READ(kind, data, 1) == '}' || (

‎Modules/_io/textio.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *myself,
340340
goto error;
341341
kind = PyUnicode_KIND(modified);
342342
out = PyUnicode_DATA(modified);
343-
PyUnicode_WRITE(kind, PyUnicode_DATA(modified), 0, '\r');
343+
PyUnicode_WRITE(kind, out, 0, '\r');
344344
memcpy(out + kind, PyUnicode_DATA(output), kind * output_len);
345345
Py_DECREF(output);
346346
output = modified; /* output remains ready */
@@ -367,7 +367,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *myself,
367367
/* Record which newlines are read and do newline translation if desired,
368368
all in one pass. */
369369
{
370-
void *in_str;
370+
const void *in_str;
371371
Py_ssize_t len;
372372
int seennl = self->seennl;
373373
int only_lf = 0;
@@ -447,7 +447,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *myself,
447447
else {
448448
void *translated;
449449
int kind = PyUnicode_KIND(output);
450-
void *in_str = PyUnicode_DATA(output);
450+
const void *in_str = PyUnicode_DATA(output);
451451
Py_ssize_t in, out;
452452
/* XXX: Previous in-place translation here is disabled as
453453
resizing is not possible anymore */
@@ -2085,7 +2085,7 @@ _PyIO_find_line_ending(
20852085
else {
20862086
/* Non-universal mode. */
20872087
Py_ssize_t readnl_len = PyUnicode_GET_LENGTH(readnl);
2088-
Py_UCS1 *nl = PyUnicode_1BYTE_DATA(readnl);
2088+
const Py_UCS1 *nl = PyUnicode_1BYTE_DATA(readnl);
20892089
/* Assume that readnl is an ASCII character. */
20902090
assert(PyUnicode_KIND(readnl) == PyUnicode_1BYTE_KIND);
20912091
if (readnl_len == 1) {
@@ -2139,7 +2139,7 @@ _textiowrapper_readline(textio *self, Py_ssize_t limit)
21392139
chunked = 0;
21402140

21412141
while (1) {
2142-
char *ptr;
2142+
const char *ptr;
21432143
Py_ssize_t line_len;
21442144
int kind;
21452145
Py_ssize_t consumed = 0;

‎Modules/_json.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ ascii_escape_unicode(PyObject *pystr)
159159
Py_ssize_t output_size;
160160
Py_ssize_t chars;
161161
PyObject *rval;
162-
void *input;
163-
unsigned char *output;
162+
const void *input;
163+
Py_UCS1 *output;
164164
int kind;
165165

166166
if (PyUnicode_READY(pystr) == -1)
@@ -225,7 +225,7 @@ escape_unicode(PyObject *pystr)
225225
Py_ssize_t output_size;
226226
Py_ssize_t chars;
227227
PyObject *rval;
228-
void *input;
228+
const void *input;
229229
int kind;
230230
Py_UCS4 maxchar;
231231

@@ -678,7 +678,7 @@ _parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ss
678678
679679
Returns a new PyObject (usually a dict, but object_hook can change that)
680680
*/
681-
void *str;
681+
const void *str;
682682
int kind;
683683
Py_ssize_t end_idx;
684684
PyObject *val = NULL;
@@ -808,7 +808,7 @@ _parse_array_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssi
808808
809809
Returns a new PyList
810810
*/
811-
void *str;
811+
const void *str;
812812
int kind;
813813
Py_ssize_t end_idx;
814814
PyObject *val = NULL;
@@ -911,7 +911,7 @@ _match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_
911911
PyLong, or PyFloat.
912912
May return other types if parse_int or parse_float are set
913913
*/
914-
void *str;
914+
const void *str;
915915
int kind;
916916
Py_ssize_t end_idx;
917917
Py_ssize_t idx = start;
@@ -1028,7 +1028,7 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_
10281028
Returns a new PyObject representation of the term.
10291029
*/
10301030
PyObject *res;
1031-
void *str;
1031+
const void *str;
10321032
int kind;
10331033
Py_ssize_t length;
10341034

‎Modules/_operator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ attrgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
11701170
for (idx = 0; idx < nattrs; ++idx) {
11711171
PyObject *item = PyTuple_GET_ITEM(args, idx);
11721172
Py_ssize_t item_len;
1173-
void *data;
1173+
const void *data;
11741174
unsigned int kind;
11751175
int dot_count;
11761176

‎Modules/_pickle.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2581,7 +2581,7 @@ raw_unicode_escape(PyObject *obj)
25812581
{
25822582
char *p;
25832583
Py_ssize_t i, size;
2584-
void *data;
2584+
const void *data;
25852585
unsigned int kind;
25862586
_PyBytesWriter writer;
25872587

‎Modules/_sqlite/connection.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ pysqlite_connection_create_collation(pysqlite_Connection* self, PyObject* args)
16441644
const char *uppercase_name_str;
16451645
int rc;
16461646
unsigned int kind;
1647-
void *data;
1647+
const void *data;
16481648

16491649
if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
16501650
goto finally;

‎Modules/_sre.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ state_reset(SRE_STATE* state)
351351
data_stack_dealloc(state);
352352
}
353353

354-
static void*
354+
static const void*
355355
getstring(PyObject* string, Py_ssize_t* p_length,
356356
int* p_isbytes, int* p_charsize,
357357
Py_buffer *view)
@@ -398,11 +398,11 @@ state_init(SRE_STATE* state, PatternObject* pattern, PyObject* string,
398398

399399
Py_ssize_t length;
400400
int isbytes, charsize;
401-
void* ptr;
401+
const void* ptr;
402402

403403
memset(state, 0, sizeof(SRE_STATE));
404404

405-
state->mark = PyMem_New(void *, pattern->groups * 2);
405+
state->mark = PyMem_New(const void *, pattern->groups * 2);
406406
if (!state->mark) {
407407
PyErr_NoMemory();
408408
goto err;
@@ -891,7 +891,7 @@ _sre_SRE_Pattern_split_impl(PatternObject *self, PyObject *string,
891891
Py_ssize_t status;
892892
Py_ssize_t n;
893893
Py_ssize_t i;
894-
void* last;
894+
const void* last;
895895

896896
assert(self->codesize != 0);
897897

@@ -984,7 +984,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string,
984984
PyObject* item;
985985
PyObject* filter;
986986
PyObject* match;
987-
void* ptr;
987+
const void* ptr;
988988
Py_ssize_t status;
989989
Py_ssize_t n;
990990
Py_ssize_t i, b, e;
@@ -1895,7 +1895,7 @@ match_getslice_by_index(MatchObject* self, Py_ssize_t index, PyObject* def)
18951895
int isbytes, charsize;
18961896
Py_buffer view;
18971897
PyObject *result;
1898-
void* ptr;
1898+
const void* ptr;
18991899
Py_ssize_t i, j;
19001900

19011901
assert(0 <= index && index < self->groups);

‎Modules/cjkcodecs/cjkcodecs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static const struct dbcs_map *mapping_list;
7272
#define ENCODER(encoding) \
7373
static Py_ssize_t encoding##_encode( \
7474
MultibyteCodec_State *state, const void *config, \
75-
int kind, void *data, \
75+
int kind, const void *data, \
7676
Py_ssize_t *inpos, Py_ssize_t inlen, \
7777
unsigned char **outbuf, Py_ssize_t outleft, int flags)
7878
#define ENCODER_RESET(encoding) \

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL