comparison Objects/floatobject.c @ 35999:9541369b0dca legacy-trunk

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 *.
author Jeremy Hylton <jeremy@alum.mit.edu>
date Sat, 10 Dec 2005 18:50:16 +0000
parents 8eda1a58a490
children 9f66bdd5a061
comparison
equal deleted inserted replaced
35998:96d1fa36964d 35999:9541369b0dca
939 939
940 static PyObject * 940 static PyObject *
941 float_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 941 float_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
942 { 942 {
943 PyObject *x = Py_False; /* Integer zero */ 943 PyObject *x = Py_False; /* Integer zero */
944 static char *kwlist[] = {"x", 0}; 944 static const char *kwlist[] = {"x", 0};
945 945
946 if (type != &PyFloat_Type) 946 if (type != &PyFloat_Type)
947 return float_subtype_new(type, args, kwds); /* Wimp out */ 947 return float_subtype_new(type, args, kwds); /* Wimp out */
948 if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x)) 948 if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x))
949 return NULL; 949 return NULL;