comparison Modules/socketmodule.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 27e1426b7f31
children 8cb686dd6e64
comparison
equal deleted inserted replaced
35998:96d1fa36964d 35999:9541369b0dca
2487 sock_initobj(PyObject *self, PyObject *args, PyObject *kwds) 2487 sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
2488 { 2488 {
2489 PySocketSockObject *s = (PySocketSockObject *)self; 2489 PySocketSockObject *s = (PySocketSockObject *)self;
2490 SOCKET_T fd; 2490 SOCKET_T fd;
2491 int family = AF_INET, type = SOCK_STREAM, proto = 0; 2491 int family = AF_INET, type = SOCK_STREAM, proto = 0;
2492 static char *keywords[] = {"family", "type", "proto", 0}; 2492 static const char *keywords[] = {"family", "type", "proto", 0};
2493 2493
2494 if (!PyArg_ParseTupleAndKeywords(args, kwds, 2494 if (!PyArg_ParseTupleAndKeywords(args, kwds,
2495 "|iii:socket", keywords, 2495 "|iii:socket", keywords,
2496 &family, &type, &proto)) 2496 &family, &type, &proto))
2497 return -1; 2497 return -1;