mirror of
https://github.com/python/cpython.git
synced 2025-11-25 04:34:37 +00:00
Add const to several API functions that take char *.
In C++, it's an error to pass a string literal to a char* function without a const_cast(). Rather than require every C++ extension module to put a cast around string literals, fix the API to state the const-ness. I focused on parts of the API where people usually pass literals: PyArg_ParseTuple() and friends, Py_BuildValue(), PyMethodDef, the type slots, etc. Predictably, there were a large set of functions that needed to be fixed as a result of these changes. The most pervasive change was to make the keyword args list passed to PyArg_ParseTupleAndKewords() to be a const char *kwlist[]. One cast was required as a result of the changes: A type object mallocs the memory for its tp_doc slot and later frees it. PyTypeObject says that tp_doc is const char *; but if the type was created by type_new(), we know it is safe to cast to char *.
This commit is contained in:
parent
aaa2f1dea7
commit
af68c874a6
52 changed files with 272 additions and 255 deletions
|
|
@ -663,7 +663,7 @@ static int
|
|||
default_3way_compare(PyObject *v, PyObject *w)
|
||||
{
|
||||
int c;
|
||||
char *vname, *wname;
|
||||
const char *vname, *wname;
|
||||
|
||||
if (v->ob_type == w->ob_type) {
|
||||
/* When comparing these pointers, they must be cast to
|
||||
|
|
@ -1018,7 +1018,7 @@ PyObject_Hash(PyObject *v)
|
|||
}
|
||||
|
||||
PyObject *
|
||||
PyObject_GetAttrString(PyObject *v, char *name)
|
||||
PyObject_GetAttrString(PyObject *v, const char *name)
|
||||
{
|
||||
PyObject *w, *res;
|
||||
|
||||
|
|
@ -1033,7 +1033,7 @@ PyObject_GetAttrString(PyObject *v, char *name)
|
|||
}
|
||||
|
||||
int
|
||||
PyObject_HasAttrString(PyObject *v, char *name)
|
||||
PyObject_HasAttrString(PyObject *v, const char *name)
|
||||
{
|
||||
PyObject *res = PyObject_GetAttrString(v, name);
|
||||
if (res != NULL) {
|
||||
|
|
@ -1045,7 +1045,7 @@ PyObject_HasAttrString(PyObject *v, char *name)
|
|||
}
|
||||
|
||||
int
|
||||
PyObject_SetAttrString(PyObject *v, char *name, PyObject *w)
|
||||
PyObject_SetAttrString(PyObject *v, const char *name, PyObject *w)
|
||||
{
|
||||
PyObject *s;
|
||||
int res;
|
||||
|
|
@ -1589,7 +1589,7 @@ merge_class_dict(PyObject* dict, PyObject* aclass)
|
|||
*/
|
||||
|
||||
static int
|
||||
merge_list_attr(PyObject* dict, PyObject* obj, char *attrname)
|
||||
merge_list_attr(PyObject* dict, PyObject* obj, const char *attrname)
|
||||
{
|
||||
PyObject *list;
|
||||
int result = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue