mirror of
https://github.com/python/cpython
synced 2026-09-29 12:10:30 +03:00
bpo-39943: Add the const qualifier to pointers on non-mutable PyBytes data. (GH-19472)
This commit is contained in:
parent
3e0dd3730b
commit
8f87eefe7f
20 changed files with 38 additions and 37 deletions
|
|
@ -1310,7 +1310,7 @@ CharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
|
|||
static int
|
||||
CharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
|
||||
{
|
||||
char *ptr;
|
||||
const char *ptr;
|
||||
Py_ssize_t size;
|
||||
|
||||
if (value == NULL) {
|
||||
|
|
|
|||
|
|
@ -1384,7 +1384,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
|
|||
static PyObject *py_dl_open(PyObject *self, PyObject *args)
|
||||
{
|
||||
PyObject *name, *name2;
|
||||
char *name_str;
|
||||
const char *name_str;
|
||||
void * handle;
|
||||
#if HAVE_DECL_RTLD_LOCAL
|
||||
int mode = RTLD_NOW | RTLD_LOCAL;
|
||||
|
|
|
|||
|
|
@ -1283,7 +1283,7 @@ s_get(void *ptr, Py_ssize_t size)
|
|||
static PyObject *
|
||||
s_set(void *ptr, PyObject *value, Py_ssize_t length)
|
||||
{
|
||||
char *data;
|
||||
const char *data;
|
||||
Py_ssize_t size;
|
||||
|
||||
if(!PyBytes_Check(value)) {
|
||||
|
|
@ -1321,7 +1321,7 @@ z_set(void *ptr, PyObject *value, Py_ssize_t size)
|
|||
return value;
|
||||
}
|
||||
if (PyBytes_Check(value)) {
|
||||
*(char **)ptr = PyBytes_AsString(value);
|
||||
*(const char **)ptr = PyBytes_AsString(value);
|
||||
Py_INCREF(value);
|
||||
return value;
|
||||
} else if (PyLong_Check(value)) {
|
||||
|
|
|
|||
|
|
@ -709,7 +709,7 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
|
|||
else
|
||||
#endif
|
||||
{
|
||||
char *str = PyBytes_AS_STRING(bytesobj);
|
||||
const char *str = PyBytes_AS_STRING(bytesobj);
|
||||
funcname = "addstr";
|
||||
if (use_xy)
|
||||
rtn = mvwaddstr(self->win,y,x,str);
|
||||
|
|
@ -792,7 +792,7 @@ _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,
|
|||
else
|
||||
#endif
|
||||
{
|
||||
char *str = PyBytes_AS_STRING(bytesobj);
|
||||
const char *str = PyBytes_AS_STRING(bytesobj);
|
||||
funcname = "addnstr";
|
||||
if (use_xy)
|
||||
rtn = mvwaddnstr(self->win,y,x,str,n);
|
||||
|
|
@ -1710,7 +1710,7 @@ _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,
|
|||
else
|
||||
#endif
|
||||
{
|
||||
char *str = PyBytes_AS_STRING(bytesobj);
|
||||
const char *str = PyBytes_AS_STRING(bytesobj);
|
||||
funcname = "insstr";
|
||||
if (use_xy)
|
||||
rtn = mvwinsstr(self->win,y,x,str);
|
||||
|
|
@ -1795,7 +1795,7 @@ _curses_window_insnstr_impl(PyCursesWindowObject *self, int group_left_1,
|
|||
else
|
||||
#endif
|
||||
{
|
||||
char *str = PyBytes_AS_STRING(bytesobj);
|
||||
const char *str = PyBytes_AS_STRING(bytesobj);
|
||||
funcname = "insnstr";
|
||||
if (use_xy)
|
||||
rtn = mvwinsnstr(self->win,y,x,str,n);
|
||||
|
|
|
|||
|
|
@ -1153,7 +1153,7 @@ checkpath(PyObject* tag)
|
|||
return 0;
|
||||
}
|
||||
if (PyBytes_Check(tag)) {
|
||||
char *p = PyBytes_AS_STRING(tag);
|
||||
const char *p = PyBytes_AS_STRING(tag);
|
||||
const Py_ssize_t len = PyBytes_GET_SIZE(tag);
|
||||
if (len >= 3 && p[0] == '{' && (
|
||||
p[1] == '}' || (p[1] == '*' && p[2] == '}'))) {
|
||||
|
|
|
|||
|
|
@ -393,7 +393,7 @@ _io_BytesIO_tell_impl(bytesio *self)
|
|||
static PyObject *
|
||||
read_bytes(bytesio *self, Py_ssize_t size)
|
||||
{
|
||||
char *output;
|
||||
const char *output;
|
||||
|
||||
assert(self->buf != NULL);
|
||||
assert(size <= self->string_size);
|
||||
|
|
@ -502,7 +502,7 @@ _io_BytesIO_readlines_impl(bytesio *self, PyObject *arg)
|
|||
{
|
||||
Py_ssize_t maxsize, size, n;
|
||||
PyObject *result, *line;
|
||||
char *output;
|
||||
const char *output;
|
||||
|
||||
CHECK_CLOSED(self);
|
||||
|
||||
|
|
|
|||
|
|
@ -2640,7 +2640,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
|
|||
Py_ssize_t chars_to_skip, chars_decoded;
|
||||
Py_ssize_t skip_bytes, skip_back;
|
||||
PyObject *saved_state = NULL;
|
||||
char *input, *input_end;
|
||||
const char *input, *input_end;
|
||||
Py_ssize_t dec_buffer_len;
|
||||
int dec_flags;
|
||||
|
||||
|
|
|
|||
|
|
@ -637,7 +637,7 @@ PyDoc_STRVAR(bindtextdomain__doc__,
|
|||
static PyObject*
|
||||
PyIntl_bindtextdomain(PyObject* self, PyObject*args)
|
||||
{
|
||||
char *domain, *dirname, *current_dirname;
|
||||
const char *domain, *dirname, *current_dirname;
|
||||
PyObject *dirname_obj, *dirname_bytes = NULL, *result;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "sO", &domain, &dirname_obj))
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
|
|||
NULL
|
||||
};
|
||||
|
||||
char* database;
|
||||
const char* database;
|
||||
PyObject* database_obj;
|
||||
int detect_types = 0;
|
||||
PyObject* isolation_level = NULL;
|
||||
|
|
|
|||
|
|
@ -4037,7 +4037,7 @@ error:
|
|||
/* internal helper function, returns -1 on error
|
||||
*/
|
||||
static int
|
||||
_add_ca_certs(PySSLContext *self, void *data, Py_ssize_t len,
|
||||
_add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
|
||||
int filetype)
|
||||
{
|
||||
BIO *biobuf = NULL;
|
||||
|
|
|
|||
|
|
@ -1785,7 +1785,7 @@ s_pack_internal(PyStructObject *soself, PyObject *const *args, int offset, char*
|
|||
if (e->format == 's') {
|
||||
Py_ssize_t n;
|
||||
int isstring;
|
||||
void *p;
|
||||
const void *p;
|
||||
isstring = PyBytes_Check(v);
|
||||
if (!isstring && !PyByteArray_Check(v)) {
|
||||
PyErr_SetString(_structmodulestate_global->StructError,
|
||||
|
|
@ -1807,7 +1807,7 @@ s_pack_internal(PyStructObject *soself, PyObject *const *args, int offset, char*
|
|||
} else if (e->format == 'p') {
|
||||
Py_ssize_t n;
|
||||
int isstring;
|
||||
void *p;
|
||||
const void *p;
|
||||
isstring = PyBytes_Check(v);
|
||||
if (!isstring && !PyByteArray_Check(v)) {
|
||||
PyErr_SetString(_structmodulestate_global->StructError,
|
||||
|
|
|
|||
|
|
@ -574,9 +574,9 @@ SplitObj(PyObject *arg)
|
|||
else if (PyBytes_Check(arg)) {
|
||||
int argc;
|
||||
const char **argv;
|
||||
char *list = PyBytes_AS_STRING(arg);
|
||||
const char *list = PyBytes_AS_STRING(arg);
|
||||
|
||||
if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
|
||||
if (Tcl_SplitList((Tcl_Interp *)NULL, (char *)list, &argc, &argv) != TCL_OK) {
|
||||
Py_INCREF(arg);
|
||||
return arg;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1246,7 +1246,7 @@ _multibytecodec_MultibyteIncrementalDecoder_setstate_impl(MultibyteIncrementalDe
|
|||
PyObject *buffer;
|
||||
PyLongObject *statelong;
|
||||
Py_ssize_t buffersize;
|
||||
char *bufferstr;
|
||||
const char *bufferstr;
|
||||
unsigned char statebytes[8];
|
||||
|
||||
if (!PyArg_ParseTuple(state, "SO!;setstate(): illegal state argument",
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ static PyObject *
|
|||
write_history_file(PyObject *self, PyObject *args)
|
||||
{
|
||||
PyObject *filename_obj = Py_None, *filename_bytes;
|
||||
char *filename;
|
||||
const char *filename;
|
||||
int err;
|
||||
if (!PyArg_ParseTuple(args, "|O:write_history_file", &filename_obj))
|
||||
return NULL;
|
||||
|
|
@ -270,7 +270,7 @@ append_history_file(PyObject *self, PyObject *args)
|
|||
{
|
||||
int nelements;
|
||||
PyObject *filename_obj = Py_None, *filename_bytes;
|
||||
char *filename;
|
||||
const char *filename;
|
||||
int err;
|
||||
if (!PyArg_ParseTuple(args, "i|O:append_history_file", &nelements, &filename_obj))
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue