Skip to content

C
cpython
Commit 34596a90 authored by Thomas Heller's avatar Thomas Heller
Browse files
Options

Merged revisions 71853 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71853 | thomas.heller | 2009-04-24 22:31:47 +0200 (Fr, 24 Apr 2009) | 3 lines

  Issue #3102: All global symbols that the _ctypes extension defines are
  now prefixed with 'Py' or '_ctypes'.
........
parent d3cfe99b
Hide whitespace changes
Inline Side-by-side
Showing with 520 additions and 518 deletions
Misc/NEWS
View file @ 34596a90
...@@ -77,6 +77,11 @@ Core and Builtins ...@@ -77,6 +77,11 @@ Core and Builtins
Library Library
------- -------
- Issue #3102: All global symbols that the _ctypes extension defines
are now prefixed with 'Py' or '_ctypes'.
- Issue #5041: ctypes does now allow pickling wide character.
- Issue #5812: For the two-argument form of the Fraction constructor, - Issue #5812: For the two-argument form of the Fraction constructor,
Fraction(m, n), m and n are permitted to be arbitrary Rational Fraction(m, n), m and n are permitted to be arbitrary Rational
instances. instances.
...@@ -430,8 +435,6 @@ Core and Builtins ...@@ -430,8 +435,6 @@ Core and Builtins
Library Library
------- -------
- Issue #5041: ctypes does now allow pickling wide character.
- Issue #5795: Fixed test_distutils failure on Debian ppc. - Issue #5795: Fixed test_distutils failure on Debian ppc.
- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. - Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries.
......
Modules/_ctypes/_ctypes.c
View file @ 34596a90
/* /*
ToDo: ToDo:
Get rid of the checker (and also the converters) field in CFuncPtrObject and Get rid of the checker (and also the converters) field in PyCFuncPtrObject and
StgDictObject, and replace them by slot functions in StgDictObject. StgDictObject, and replace them by slot functions in StgDictObject.
think about a buffer-like object (memory? bytes?) think about a buffer-like object (memory? bytes?)
...@@ -23,20 +23,20 @@ ...@@ -23,20 +23,20 @@
Name methods, members, getsets Name methods, members, getsets
============================================================================== ==============================================================================
StructType_Type __new__(), from_address(), __mul__(), from_param() PyCStructType_Type __new__(), from_address(), __mul__(), from_param()
UnionType_Type __new__(), from_address(), __mul__(), from_param() UnionType_Type __new__(), from_address(), __mul__(), from_param()
PointerType_Type __new__(), from_address(), __mul__(), from_param(), set_type() PyCPointerType_Type __new__(), from_address(), __mul__(), from_param(), set_type()
ArrayType_Type __new__(), from_address(), __mul__(), from_param() PyCArrayType_Type __new__(), from_address(), __mul__(), from_param()
SimpleType_Type __new__(), from_address(), __mul__(), from_param() PyCSimpleType_Type __new__(), from_address(), __mul__(), from_param()
CData_Type PyCData_Type
Struct_Type __new__(), __init__() Struct_Type __new__(), __init__()
Pointer_Type __new__(), __init__(), _as_parameter_, contents PyCPointer_Type __new__(), __init__(), _as_parameter_, contents
Array_Type __new__(), __init__(), _as_parameter_, __get/setitem__(), __len__() PyCArray_Type __new__(), __init__(), _as_parameter_, __get/setitem__(), __len__()
Simple_Type __new__(), __init__(), _as_parameter_ Simple_Type __new__(), __init__(), _as_parameter_
CField_Type PyCField_Type
StgDict_Type PyCStgDict_Type
============================================================================== ==============================================================================
...@@ -82,20 +82,20 @@ bytes(cdata) ...@@ -82,20 +82,20 @@ bytes(cdata)
*/ */
/* /*
* StgDict_Type * PyCStgDict_Type
* StructType_Type * PyCStructType_Type
* UnionType_Type * UnionType_Type
* PointerType_Type * PyCPointerType_Type
* ArrayType_Type * PyCArrayType_Type
* SimpleType_Type * PyCSimpleType_Type
* *
* CData_Type * PyCData_Type
* Struct_Type * Struct_Type
* Union_Type * Union_Type
* Array_Type * PyCArray_Type
* Simple_Type * Simple_Type
* Pointer_Type * PyCPointer_Type
* CField_Type * PyCField_Type
* *
*/ */
...@@ -125,15 +125,15 @@ bytes(cdata) ...@@ -125,15 +125,15 @@ bytes(cdata)
PyObject *PyExc_ArgError; PyObject *PyExc_ArgError;
/* This dict maps ctypes types to POINTER types */ /* This dict maps ctypes types to POINTER types */
PyObject *_pointer_type_cache; PyObject *_ctypes_ptrtype_cache;
static PyTypeObject Simple_Type; static PyTypeObject Simple_Type;
/* a callable object used for unpickling */ /* a callable object used for unpickling */
static PyObject *_unpickle; static PyObject *_unpickle;
char *conversion_mode_encoding = NULL; char *_ctypes_conversion_encoding = NULL;
char *conversion_mode_errors = NULL; char *_ctypes_conversion_errors = NULL;
/****************************************************************/ /****************************************************************/
...@@ -267,7 +267,7 @@ PyDict_GetItemProxy(PyObject *dict, PyObject *key) ...@@ -267,7 +267,7 @@ PyDict_GetItemProxy(PyObject *dict, PyObject *key)
already be set. already be set.
*/ */
char * char *
alloc_format_string(const char *prefix, const char *suffix) _ctypes_alloc_format_string(const char *prefix, const char *suffix)
{ {
size_t len; size_t len;
char *result; char *result;
...@@ -291,7 +291,7 @@ alloc_format_string(const char *prefix, const char *suffix) ...@@ -291,7 +291,7 @@ alloc_format_string(const char *prefix, const char *suffix)
} }
/* /*
StructType_Type - a meta type/class. Creating a new class using this one as PyCStructType_Type - a meta type/class. Creating a new class using this one as
__metaclass__ will call the contructor StructUnionType_new. It replaces the __metaclass__ will call the contructor StructUnionType_new. It replaces the
tp_dict member with a new instance of StgDict, and initializes the C tp_dict member with a new instance of StgDict, and initializes the C
accessible fields somehow. accessible fields somehow.
...@@ -303,7 +303,7 @@ StructUnionType_paramfunc(CDataObject *self) ...@@ -303,7 +303,7 @@ StructUnionType_paramfunc(CDataObject *self)
PyCArgObject *parg; PyCArgObject *parg;
StgDictObject *stgdict; StgDictObject *stgdict;
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
...@@ -339,7 +339,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt ...@@ -339,7 +339,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
if (PyDict_GetItemString(result->tp_dict, "_abstract_")) if (PyDict_GetItemString(result->tp_dict, "_abstract_"))
return (PyObject *)result; return (PyObject *)result;
dict = (StgDictObject *)PyObject_CallObject((PyObject *)&StgDict_Type, NULL); dict = (StgDictObject *)PyObject_CallObject((PyObject *)&PyCStgDict_Type, NULL);
if (!dict) { if (!dict) {
Py_DECREF(result); Py_DECREF(result);
return NULL; return NULL;
...@@ -353,7 +353,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt ...@@ -353,7 +353,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
} }
Py_DECREF(result->tp_dict); Py_DECREF(result->tp_dict);
result->tp_dict = (PyObject *)dict; result->tp_dict = (PyObject *)dict;
dict->format = alloc_format_string(NULL, "B"); dict->format = _ctypes_alloc_format_string(NULL, "B");
if (dict->format == NULL) { if (dict->format == NULL) {
Py_DECREF(result); Py_DECREF(result);
return NULL; return NULL;
...@@ -368,7 +368,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt ...@@ -368,7 +368,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
if (basedict == NULL) if (basedict == NULL)
return (PyObject *)result; return (PyObject *)result;
/* copy base dict */ /* copy base dict */
if (-1 == StgDict_clone(dict, basedict)) { if (-1 == PyCStgDict_clone(dict, basedict)) {
Py_DECREF(result); Py_DECREF(result);
return NULL; return NULL;
} }
...@@ -385,7 +385,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt ...@@ -385,7 +385,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
} }
static PyObject * static PyObject *
StructType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCStructType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
return StructUnionType_new(type, args, kwds, 1); return StructUnionType_new(type, args, kwds, 1);
} }
...@@ -411,7 +411,7 @@ CDataType_from_address(PyObject *type, PyObject *value) ...@@ -411,7 +411,7 @@ CDataType_from_address(PyObject *type, PyObject *value)
buf = (void *)PyLong_AsVoidPtr(value); buf = (void *)PyLong_AsVoidPtr(value);
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;
return CData_AtAddress(type, buf); return PyCData_AtAddress(type, buf);
} }
static char from_buffer_doc[] = static char from_buffer_doc[] =
...@@ -458,7 +458,7 @@ CDataType_from_buffer(PyObject *type, PyObject *args) ...@@ -458,7 +458,7 @@ CDataType_from_buffer(PyObject *type, PyObject *args)
return NULL; return NULL;
} }
result = CData_AtAddress(type, (char *)buffer + offset); result = PyCData_AtAddress(type, (char *)buffer + offset);
if (result == NULL) if (result == NULL)
return NULL; return NULL;
...@@ -474,7 +474,7 @@ static char from_buffer_copy_doc[] = ...@@ -474,7 +474,7 @@ static char from_buffer_copy_doc[] =
"C.from_buffer_copy(object, offset=0) -> C instance\ncreate a C instance from a readable buffer"; "C.from_buffer_copy(object, offset=0) -> C instance\ncreate a C instance from a readable buffer";
static PyObject * static PyObject *
GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds); GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
static PyObject * static PyObject *
CDataType_from_buffer_copy(PyObject *type, PyObject *args) CDataType_from_buffer_copy(PyObject *type, PyObject *args)
...@@ -515,7 +515,7 @@ CDataType_from_buffer_copy(PyObject *type, PyObject *args) ...@@ -515,7 +515,7 @@ CDataType_from_buffer_copy(PyObject *type, PyObject *args)
return NULL; return NULL;
} }
result = GenericCData_new((PyTypeObject *)type, NULL, NULL); result = GenericPyCData_new((PyTypeObject *)type, NULL, NULL);
if (result == NULL) if (result == NULL)
return NULL; return NULL;
memcpy(((CDataObject *)result)->b_ptr, memcpy(((CDataObject *)result)->b_ptr,
...@@ -577,7 +577,7 @@ CDataType_in_dll(PyObject *type, PyObject *args) ...@@ -577,7 +577,7 @@ CDataType_in_dll(PyObject *type, PyObject *args)
return NULL; return NULL;
} }
#endif #endif
return CData_AtAddress(type, address); return PyCData_AtAddress(type, address);
} }
static char from_param_doc[] = static char from_param_doc[] =
...@@ -641,7 +641,7 @@ CDataType_repeat(PyObject *self, Py_ssize_t length) ...@@ -641,7 +641,7 @@ CDataType_repeat(PyObject *self, Py_ssize_t length)
return PyErr_Format(PyExc_ValueError, return PyErr_Format(PyExc_ValueError,
"Array length must be >= 0, not %zd", "Array length must be >= 0, not %zd",
length); length);
return CreateArrayType(self, length); return PyCArrayType_from_ctype(self, length);
} }
static PySequenceMethods CDataType_as_sequence = { static PySequenceMethods CDataType_as_sequence = {
...@@ -677,7 +677,7 @@ CDataType_traverse(PyTypeObject *self, visitproc visit, void *arg) ...@@ -677,7 +677,7 @@ CDataType_traverse(PyTypeObject *self, visitproc visit, void *arg)
} }
static int static int
StructType_setattro(PyObject *self, PyObject *key, PyObject *value) PyCStructType_setattro(PyObject *self, PyObject *key, PyObject *value)
{ {
/* XXX Should we disallow deleting _fields_? */ /* XXX Should we disallow deleting _fields_? */
if (-1 == PyType_Type.tp_setattro(self, key, value)) if (-1 == PyType_Type.tp_setattro(self, key, value))
...@@ -686,7 +686,7 @@ StructType_setattro(PyObject *self, PyObject *key, PyObject *value) ...@@ -686,7 +686,7 @@ StructType_setattro(PyObject *self, PyObject *key, PyObject *value)
if (value && PyUnicode_Check(key) && if (value && PyUnicode_Check(key) &&
/* XXX struni _PyUnicode_AsString can fail (also in other places)! */ /* XXX struni _PyUnicode_AsString can fail (also in other places)! */
0 == strcmp(_PyUnicode_AsString(key), "_fields_")) 0 == strcmp(_PyUnicode_AsString(key), "_fields_"))
return StructUnionType_update_stgdict(self, value, 1); return PyCStructUnionType_update_stgdict(self, value, 1);
return 0; return 0;
} }
...@@ -700,14 +700,14 @@ UnionType_setattro(PyObject *self, PyObject *key, PyObject *value) ...@@ -700,14 +700,14 @@ UnionType_setattro(PyObject *self, PyObject *key, PyObject *value)
if (PyUnicode_Check(key) && if (PyUnicode_Check(key) &&
0 == strcmp(_PyUnicode_AsString(key), "_fields_")) 0 == strcmp(_PyUnicode_AsString(key), "_fields_"))
return StructUnionType_update_stgdict(self, value, 0); return PyCStructUnionType_update_stgdict(self, value, 0);
return 0; return 0;
} }
PyTypeObject StructType_Type = { PyTypeObject PyCStructType_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.StructType", /* tp_name */ "_ctypes.PyCStructType", /* tp_name */
0, /* tp_basicsize */ 0, /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
...@@ -723,7 +723,7 @@ PyTypeObject StructType_Type = { ...@@ -723,7 +723,7 @@ PyTypeObject StructType_Type = {
0, /* tp_call */ 0, /* tp_call */
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
StructType_setattro, /* tp_setattro */ PyCStructType_setattro, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
"metatype for the CData Objects", /* tp_doc */ "metatype for the CData Objects", /* tp_doc */
...@@ -743,7 +743,7 @@ PyTypeObject StructType_Type = { ...@@ -743,7 +743,7 @@ PyTypeObject StructType_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
StructType_new, /* tp_new */ PyCStructType_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
...@@ -794,20 +794,20 @@ static PyTypeObject UnionType_Type = { ...@@ -794,20 +794,20 @@ static PyTypeObject UnionType_Type = {
/* /*
The PointerType_Type metaclass must ensure that the subclass of Pointer can be The PyCPointerType_Type metaclass must ensure that the subclass of Pointer can be
created. It must check for a _type_ attribute in the class. Since are no created. It must check for a _type_ attribute in the class. Since are no
runtime created properties, a CField is probably *not* needed ? runtime created properties, a CField is probably *not* needed ?
class IntPointer(Pointer): class IntPointer(Pointer):
_type_ = "i" _type_ = "i"
The Pointer_Type provides the functionality: a contents method/property, a The PyCPointer_Type provides the functionality: a contents method/property, a
size property/method, and the sequence protocol. size property/method, and the sequence protocol.
*/ */
static int static int
PointerType_SetProto(StgDictObject *stgdict, PyObject *proto) PyCPointerType_SetProto(StgDictObject *stgdict, PyObject *proto)
{ {
if (!proto || !PyType_Check(proto)) { if (!proto || !PyType_Check(proto)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
...@@ -826,11 +826,11 @@ PointerType_SetProto(StgDictObject *stgdict, PyObject *proto) ...@@ -826,11 +826,11 @@ PointerType_SetProto(StgDictObject *stgdict, PyObject *proto)
} }
static PyCArgObject * static PyCArgObject *
PointerType_paramfunc(CDataObject *self) PyCPointerType_paramfunc(CDataObject *self)
{ {
PyCArgObject *parg; PyCArgObject *parg;
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
...@@ -843,7 +843,7 @@ PointerType_paramfunc(CDataObject *self) ...@@ -843,7 +843,7 @@ PointerType_paramfunc(CDataObject *self)
} }
static PyObject * static PyObject *
PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
PyTypeObject *result; PyTypeObject *result;
StgDictObject *stgdict; StgDictObject *stgdict;
...@@ -858,18 +858,18 @@ PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -858,18 +858,18 @@ PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
stgdict->proto has info about the pointed to type! stgdict->proto has info about the pointed to type!
*/ */
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)PyObject_CallObject(
(PyObject *)&StgDict_Type, NULL); (PyObject *)&PyCStgDict_Type, NULL);
if (!stgdict) if (!stgdict)
return NULL; return NULL;
stgdict->size = sizeof(void *); stgdict->size = sizeof(void *);
stgdict->align = getentry("P")->pffi_type->alignment; stgdict->align = _ctypes_get_fielddesc("P")->pffi_type->alignment;
stgdict->length = 1; stgdict->length = 1;
stgdict->ffi_type_pointer = ffi_type_pointer; stgdict->ffi_type_pointer = ffi_type_pointer;
stgdict->paramfunc = PointerType_paramfunc; stgdict->paramfunc = PyCPointerType_paramfunc;
stgdict->flags |= TYPEFLAG_ISPOINTER; stgdict->flags |= TYPEFLAG_ISPOINTER;
proto = PyDict_GetItemString(typedict, "_type_"); /* Borrowed ref */ proto = PyDict_GetItemString(typedict, "_type_"); /* Borrowed ref */
if (proto && -1 == PointerType_SetProto(stgdict, proto)) { if (proto && -1 == PyCPointerType_SetProto(stgdict, proto)) {
Py_DECREF((PyObject *)stgdict); Py_DECREF((PyObject *)stgdict);
return NULL; return NULL;
} }
...@@ -882,7 +882,7 @@ PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -882,7 +882,7 @@ PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
'pointer to bytes' in this case. XXX Better would be to 'pointer to bytes' in this case. XXX Better would be to
fix the format string later... fix the format string later...
*/ */
stgdict->format = alloc_format_string("&", stgdict->format = _ctypes_alloc_format_string("&",
itemdict->format ? itemdict->format : "B"); itemdict->format ? itemdict->format : "B");
if (stgdict->format == NULL) { if (stgdict->format == NULL) {
Py_DECREF((PyObject *)stgdict); Py_DECREF((PyObject *)stgdict);
...@@ -912,14 +912,14 @@ PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -912,14 +912,14 @@ PointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static PyObject * static PyObject *
PointerType_set_type(PyTypeObject *self, PyObject *type) PyCPointerType_set_type(PyTypeObject *self, PyObject *type)
{ {
StgDictObject *dict; StgDictObject *dict;
dict = PyType_stgdict((PyObject *)self); dict = PyType_stgdict((PyObject *)self);
assert(dict); assert(dict);
if (-1 == PointerType_SetProto(dict, type)) if (-1 == PyCPointerType_SetProto(dict, type))
return NULL; return NULL;
if (-1 == PyDict_SetItemString((PyObject *)dict, "_type_", type)) if (-1 == PyDict_SetItemString((PyObject *)dict, "_type_", type))
...@@ -932,7 +932,7 @@ PointerType_set_type(PyTypeObject *self, PyObject *type) ...@@ -932,7 +932,7 @@ PointerType_set_type(PyTypeObject *self, PyObject *type)
static PyObject *_byref(PyObject *); static PyObject *_byref(PyObject *);
static PyObject * static PyObject *
PointerType_from_param(PyObject *type, PyObject *value) PyCPointerType_from_param(PyObject *type, PyObject *value)
{ {
StgDictObject *typedict; StgDictObject *typedict;
...@@ -970,19 +970,19 @@ PointerType_from_param(PyObject *type, PyObject *value) ...@@ -970,19 +970,19 @@ PointerType_from_param(PyObject *type, PyObject *value)
return CDataType_from_param(type, value); return CDataType_from_param(type, value);
} }
static PyMethodDef PointerType_methods[] = { static PyMethodDef PyCPointerType_methods[] = {
{ "from_address", CDataType_from_address, METH_O, from_address_doc }, { "from_address", CDataType_from_address, METH_O, from_address_doc },
{ "from_buffer", CDataType_from_buffer, METH_VARARGS, from_buffer_doc, }, { "from_buffer", CDataType_from_buffer, METH_VARARGS, from_buffer_doc, },
{ "from_buffer_copy", CDataType_from_buffer_copy, METH_VARARGS, from_buffer_copy_doc, }, { "from_buffer_copy", CDataType_from_buffer_copy, METH_VARARGS, from_buffer_copy_doc, },
{ "in_dll", CDataType_in_dll, METH_VARARGS, in_dll_doc}, { "in_dll", CDataType_in_dll, METH_VARARGS, in_dll_doc},
{ "from_param", (PyCFunction)PointerType_from_param, METH_O, from_param_doc}, { "from_param", (PyCFunction)PyCPointerType_from_param, METH_O, from_param_doc},
{ "set_type", (PyCFunction)PointerType_set_type, METH_O }, { "set_type", (PyCFunction)PyCPointerType_set_type, METH_O },
{ NULL, NULL }, { NULL, NULL },
}; };
PyTypeObject PointerType_Type = { PyTypeObject PyCPointerType_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.PointerType", /* tp_name */ "_ctypes.PyCPointerType", /* tp_name */
0, /* tp_basicsize */ 0, /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
...@@ -1008,7 +1008,7 @@ PyTypeObject PointerType_Type = { ...@@ -1008,7 +1008,7 @@ PyTypeObject PointerType_Type = {
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
PointerType_methods, /* tp_methods */ PyCPointerType_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
...@@ -1018,17 +1018,17 @@ PyTypeObject PointerType_Type = { ...@@ -1018,17 +1018,17 @@ PyTypeObject PointerType_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
PointerType_new, /* tp_new */ PyCPointerType_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
ArrayType_Type PyCArrayType_Type
*/ */
/* /*
ArrayType_new ensures that the new Array subclass created has a _length_ PyCArrayType_new ensures that the new Array subclass created has a _length_
attribute, and a _type_ attribute. attribute, and a _type_ attribute.
*/ */
...@@ -1089,8 +1089,8 @@ CharArray_set_value(CDataObject *self, PyObject *value) ...@@ -1089,8 +1089,8 @@ CharArray_set_value(CDataObject *self, PyObject *value)
if (PyUnicode_Check(value)) { if (PyUnicode_Check(value)) {
value = PyUnicode_AsEncodedString(value, value = PyUnicode_AsEncodedString(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (!value) if (!value)
return -1; return -1;
} else if (!PyBytes_Check(value)) { } else if (!PyBytes_Check(value)) {
...@@ -1149,8 +1149,8 @@ WCharArray_set_value(CDataObject *self, PyObject *value) ...@@ -1149,8 +1149,8 @@ WCharArray_set_value(CDataObject *self, PyObject *value)
} }
if (PyBytes_Check(value)) { if (PyBytes_Check(value)) {
value = PyUnicode_FromEncodedObject(value, value = PyUnicode_FromEncodedObject(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (!value) if (!value)
return -1; return -1;
} else if (!PyUnicode_Check(value)) { } else if (!PyUnicode_Check(value)) {
...@@ -1242,9 +1242,9 @@ add_getset(PyTypeObject *type, PyGetSetDef *gsp) ...@@ -1242,9 +1242,9 @@ add_getset(PyTypeObject *type, PyGetSetDef *gsp)
} }
static PyCArgObject * static PyCArgObject *
ArrayType_paramfunc(CDataObject *self) PyCArrayType_paramfunc(CDataObject *self)
{ {
PyCArgObject *p = new_CArgObject(); PyCArgObject *p = PyCArgObject_new();
if (p == NULL) if (p == NULL)
return NULL; return NULL;
p->tag = 'P'; p->tag = 'P';
...@@ -1256,7 +1256,7 @@ ArrayType_paramfunc(CDataObject *self) ...@@ -1256,7 +1256,7 @@ ArrayType_paramfunc(CDataObject *self)
} }
static PyObject * static PyObject *
ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
PyTypeObject *result; PyTypeObject *result;
StgDictObject *stgdict; StgDictObject *stgdict;
...@@ -1294,7 +1294,7 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1294,7 +1294,7 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)PyObject_CallObject(
(PyObject *)&StgDict_Type, NULL); (PyObject *)&PyCStgDict_Type, NULL);
if (!stgdict) if (!stgdict)
return NULL; return NULL;
...@@ -1309,10 +1309,10 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1309,10 +1309,10 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
assert(itemdict->format); assert(itemdict->format);
if (itemdict->format[0] == '(') { if (itemdict->format[0] == '(') {
sprintf(buf, "(%ld,", length); sprintf(buf, "(%ld,", length);
stgdict->format = alloc_format_string(buf, itemdict->format+1); stgdict->format = _ctypes_alloc_format_string(buf, itemdict->format+1);
} else { } else {
sprintf(buf, "(%ld)", length); sprintf(buf, "(%ld)", length);
stgdict->format = alloc_format_string(buf, itemdict->format); stgdict->format = _ctypes_alloc_format_string(buf, itemdict->format);
} }
if (stgdict->format == NULL) { if (stgdict->format == NULL) {
Py_DECREF((PyObject *)stgdict); Py_DECREF((PyObject *)stgdict);
...@@ -1346,7 +1346,7 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1346,7 +1346,7 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
Py_INCREF(proto); Py_INCREF(proto);
stgdict->proto = proto; stgdict->proto = proto;
stgdict->paramfunc = &ArrayType_paramfunc; stgdict->paramfunc = &PyCArrayType_paramfunc;
/* Arrays are passed as pointers to function calls. */ /* Arrays are passed as pointers to function calls. */
stgdict->ffi_type_pointer = ffi_type_pointer; stgdict->ffi_type_pointer = ffi_type_pointer;
...@@ -1369,11 +1369,11 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1369,11 +1369,11 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
/* Special case for character arrays. /* Special case for character arrays.
A permanent annoyance: char arrays are also strings! A permanent annoyance: char arrays are also strings!
*/ */
if (itemdict->getfunc == getentry("c")->getfunc) { if (itemdict->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
if (-1 == add_getset(result, CharArray_getsets)) if (-1 == add_getset(result, CharArray_getsets))
return NULL; return NULL;
#ifdef CTYPES_UNICODE #ifdef CTYPES_UNICODE
} else if (itemdict->getfunc == getentry("u")->getfunc) { } else if (itemdict->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
if (-1 == add_getset(result, WCharArray_getsets)) if (-1 == add_getset(result, WCharArray_getsets))
return NULL; return NULL;
#endif #endif
...@@ -1382,9 +1382,9 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1382,9 +1382,9 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return (PyObject *)result; return (PyObject *)result;
} }
PyTypeObject ArrayType_Type = { PyTypeObject PyCArrayType_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.ArrayType", /* tp_name */ "_ctypes.PyCArrayType", /* tp_name */
0, /* tp_basicsize */ 0, /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
...@@ -1420,18 +1420,18 @@ PyTypeObject ArrayType_Type = { ...@@ -1420,18 +1420,18 @@ PyTypeObject ArrayType_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
ArrayType_new, /* tp_new */ PyCArrayType_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
SimpleType_Type PyCSimpleType_Type
*/ */
/* /*
SimpleType_new ensures that the new Simple_Type subclass created has a valid PyCSimpleType_new ensures that the new Simple_Type subclass created has a valid
_type_ attribute. _type_ attribute.
*/ */
...@@ -1448,9 +1448,9 @@ c_wchar_p_from_param(PyObject *type, PyObject *value) ...@@ -1448,9 +1448,9 @@ c_wchar_p_from_param(PyObject *type, PyObject *value)
} }
if (PyUnicode_Check(value) || PyBytes_Check(value)) { if (PyUnicode_Check(value) || PyBytes_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
struct fielddesc *fd = getentry("Z"); struct fielddesc *fd = _ctypes_get_fielddesc("Z");
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1472,7 +1472,7 @@ c_wchar_p_from_param(PyObject *type, PyObject *value) ...@@ -1472,7 +1472,7 @@ c_wchar_p_from_param(PyObject *type, PyObject *value)
StgDictObject *dict; StgDictObject *dict;
assert(dt); /* Cannot be NULL for pointer or array objects */ assert(dt); /* Cannot be NULL for pointer or array objects */
dict = dt && dt->proto ? PyType_stgdict(dt->proto) : NULL; dict = dt && dt->proto ? PyType_stgdict(dt->proto) : NULL;
if (dict && (dict->setfunc == getentry("u")->setfunc)) { if (dict && (dict->setfunc == _ctypes_get_fielddesc("u")->setfunc)) {
Py_INCREF(value); Py_INCREF(value);
return value; return value;
} }
...@@ -1481,7 +1481,7 @@ c_wchar_p_from_param(PyObject *type, PyObject *value) ...@@ -1481,7 +1481,7 @@ c_wchar_p_from_param(PyObject *type, PyObject *value)
/* byref(c_char(...)) */ /* byref(c_char(...)) */
PyCArgObject *a = (PyCArgObject *)value; PyCArgObject *a = (PyCArgObject *)value;
StgDictObject *dict = PyObject_stgdict(a->obj); StgDictObject *dict = PyObject_stgdict(a->obj);
if (dict && (dict->setfunc == getentry("u")->setfunc)) { if (dict && (dict->setfunc == _ctypes_get_fielddesc("u")->setfunc)) {
Py_INCREF(value); Py_INCREF(value);
return value; return value;
} }
...@@ -1509,9 +1509,9 @@ c_char_p_from_param(PyObject *type, PyObject *value) ...@@ -1509,9 +1509,9 @@ c_char_p_from_param(PyObject *type, PyObject *value)
} }
if (PyBytes_Check(value) || PyUnicode_Check(value)) { if (PyBytes_Check(value) || PyUnicode_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
struct fielddesc *fd = getentry("z"); struct fielddesc *fd = _ctypes_get_fielddesc("z");
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1533,7 +1533,7 @@ c_char_p_from_param(PyObject *type, PyObject *value) ...@@ -1533,7 +1533,7 @@ c_char_p_from_param(PyObject *type, PyObject *value)
StgDictObject *dict; StgDictObject *dict;
assert(dt); /* Cannot be NULL for pointer or array objects */ assert(dt); /* Cannot be NULL for pointer or array objects */
dict = dt && dt->proto ? PyType_stgdict(dt->proto) : NULL; dict = dt && dt->proto ? PyType_stgdict(dt->proto) : NULL;
if (dict && (dict->setfunc == getentry("c")->setfunc)) { if (dict && (dict->setfunc == _ctypes_get_fielddesc("c")->setfunc)) {
Py_INCREF(value); Py_INCREF(value);
return value; return value;
} }
...@@ -1542,7 +1542,7 @@ c_char_p_from_param(PyObject *type, PyObject *value) ...@@ -1542,7 +1542,7 @@ c_char_p_from_param(PyObject *type, PyObject *value)
/* byref(c_char(...)) */ /* byref(c_char(...)) */
PyCArgObject *a = (PyCArgObject *)value; PyCArgObject *a = (PyCArgObject *)value;
StgDictObject *dict = PyObject_stgdict(a->obj); StgDictObject *dict = PyObject_stgdict(a->obj);
if (dict && (dict->setfunc == getentry("c")->setfunc)) { if (dict && (dict->setfunc == _ctypes_get_fielddesc("c")->setfunc)) {
Py_INCREF(value); Py_INCREF(value);
return value; return value;
} }
...@@ -1575,9 +1575,9 @@ c_void_p_from_param(PyObject *type, PyObject *value) ...@@ -1575,9 +1575,9 @@ c_void_p_from_param(PyObject *type, PyObject *value)
/* int, long */ /* int, long */
if (PyLong_Check(value)) { if (PyLong_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
struct fielddesc *fd = getentry("P"); struct fielddesc *fd = _ctypes_get_fielddesc("P");
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1593,9 +1593,9 @@ c_void_p_from_param(PyObject *type, PyObject *value) ...@@ -1593,9 +1593,9 @@ c_void_p_from_param(PyObject *type, PyObject *value)
/* string */ /* string */
if (PyBytes_Check(value)) { if (PyBytes_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
struct fielddesc *fd = getentry("z"); struct fielddesc *fd = _ctypes_get_fielddesc("z");
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1610,9 +1610,9 @@ c_void_p_from_param(PyObject *type, PyObject *value) ...@@ -1610,9 +1610,9 @@ c_void_p_from_param(PyObject *type, PyObject *value)
/* bytes */ /* bytes */
if (PyByteArray_Check(value)) { if (PyByteArray_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
struct fielddesc *fd = getentry("z"); struct fielddesc *fd = _ctypes_get_fielddesc("z");
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1627,9 +1627,9 @@ c_void_p_from_param(PyObject *type, PyObject *value) ...@@ -1627,9 +1627,9 @@ c_void_p_from_param(PyObject *type, PyObject *value)
/* unicode */ /* unicode */
if (PyUnicode_Check(value)) { if (PyUnicode_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
struct fielddesc *fd = getentry("Z"); struct fielddesc *fd = _ctypes_get_fielddesc("Z");
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1663,11 +1663,11 @@ c_void_p_from_param(PyObject *type, PyObject *value) ...@@ -1663,11 +1663,11 @@ c_void_p_from_param(PyObject *type, PyObject *value)
} }
} }
/* function pointer */ /* function pointer */
if (CFuncPtrObject_Check(value)) { if (PyCFuncPtrObject_Check(value)) {
PyCArgObject *parg; PyCArgObject *parg;
CFuncPtrObject *func; PyCFuncPtrObject *func;
func = (CFuncPtrObject *)value; func = (PyCFuncPtrObject *)value;
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1685,7 +1685,7 @@ c_void_p_from_param(PyObject *type, PyObject *value) ...@@ -1685,7 +1685,7 @@ c_void_p_from_param(PyObject *type, PyObject *value)
switch (_PyUnicode_AsString(stgd->proto)[0]) { switch (_PyUnicode_AsString(stgd->proto)[0]) {
case 'z': /* c_char_p */ case 'z': /* c_char_p */
case 'Z': /* c_wchar_p */ case 'Z': /* c_wchar_p */
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
parg->pffi_type = &ffi_type_pointer; parg->pffi_type = &ffi_type_pointer;
...@@ -1756,7 +1756,7 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject ...@@ -1756,7 +1756,7 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject
return NULL; return NULL;
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)PyObject_CallObject(
(PyObject *)&StgDict_Type, NULL); (PyObject *)&PyCStgDict_Type, NULL);
if (!stgdict) /* XXX leaks result! */ if (!stgdict) /* XXX leaks result! */
return NULL; return NULL;
...@@ -1783,7 +1783,7 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject ...@@ -1783,7 +1783,7 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject
} }
static PyCArgObject * static PyCArgObject *
SimpleType_paramfunc(CDataObject *self) PyCSimpleType_paramfunc(CDataObject *self)
{ {
StgDictObject *dict; StgDictObject *dict;
char *fmt; char *fmt;
...@@ -1795,10 +1795,10 @@ SimpleType_paramfunc(CDataObject *self) ...@@ -1795,10 +1795,10 @@ SimpleType_paramfunc(CDataObject *self)
fmt = _PyUnicode_AsString(dict->proto); fmt = _PyUnicode_AsString(dict->proto);
assert(fmt); assert(fmt);
fd = getentry(fmt); fd = _ctypes_get_fielddesc(fmt);
assert(fd); assert(fd);
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
...@@ -1811,7 +1811,7 @@ SimpleType_paramfunc(CDataObject *self) ...@@ -1811,7 +1811,7 @@ SimpleType_paramfunc(CDataObject *self)
} }
static PyObject * static PyObject *
SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
PyTypeObject *result; PyTypeObject *result;
StgDictObject *stgdict; StgDictObject *stgdict;
...@@ -1860,7 +1860,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1860,7 +1860,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
SIMPLE_TYPE_CHARS); SIMPLE_TYPE_CHARS);
goto error; goto error;
} }
fmt = getentry(proto_str); fmt = _ctypes_get_fielddesc(proto_str);
if (fmt == NULL) { if (fmt == NULL) {
Py_DECREF((PyObject *)result); Py_DECREF((PyObject *)result);
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
...@@ -1869,7 +1869,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1869,7 +1869,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)PyObject_CallObject(
(PyObject *)&StgDict_Type, NULL); (PyObject *)&PyCStgDict_Type, NULL);
if (!stgdict) if (!stgdict)
return NULL; return NULL;
...@@ -1880,9 +1880,9 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1880,9 +1880,9 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
stgdict->setfunc = fmt->setfunc; stgdict->setfunc = fmt->setfunc;
stgdict->getfunc = fmt->getfunc; stgdict->getfunc = fmt->getfunc;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
stgdict->format = alloc_format_string(">", proto_str); stgdict->format = _ctypes_alloc_format_string(">", proto_str);
#else #else
stgdict->format = alloc_format_string("<", proto_str); stgdict->format = _ctypes_alloc_format_string("<", proto_str);
#endif #endif
if (stgdict->format == NULL) { if (stgdict->format == NULL) {
Py_DECREF(result); Py_DECREF(result);
...@@ -1890,7 +1890,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1890,7 +1890,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
stgdict->paramfunc = SimpleType_paramfunc; stgdict->paramfunc = PyCSimpleType_paramfunc;
/* /*
if (result->tp_base != &Simple_Type) { if (result->tp_base != &Simple_Type) {
stgdict->setfunc = NULL; stgdict->setfunc = NULL;
...@@ -1911,7 +1911,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1911,7 +1911,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
result->tp_dict = (PyObject *)stgdict; result->tp_dict = (PyObject *)stgdict;
/* Install from_param class methods in ctypes base classes. /* Install from_param class methods in ctypes base classes.
Overrides the SimpleType_from_param generic method. Overrides the PyCSimpleType_from_param generic method.
*/ */
if (result->tp_base == &Simple_Type) { if (result->tp_base == &Simple_Type) {
switch (*proto_str) { switch (*proto_str) {
...@@ -1955,7 +1955,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1955,7 +1955,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
} }
if (type == &SimpleType_Type && fmt->setfunc_swapped && fmt->getfunc_swapped) { if (type == &PyCSimpleType_Type && fmt->setfunc_swapped && fmt->getfunc_swapped) {
PyObject *swapped = CreateSwappedType(type, args, kwds, PyObject *swapped = CreateSwappedType(type, args, kwds,
proto, fmt); proto, fmt);
StgDictObject *sw_dict; StgDictObject *sw_dict;
...@@ -1970,14 +1970,14 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1970,14 +1970,14 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject_SetAttrString(swapped, "__ctype_be__", (PyObject *)result); PyObject_SetAttrString(swapped, "__ctype_be__", (PyObject *)result);
PyObject_SetAttrString(swapped, "__ctype_le__", swapped); PyObject_SetAttrString(swapped, "__ctype_le__", swapped);
/* We are creating the type for the OTHER endian */ /* We are creating the type for the OTHER endian */
sw_dict->format = alloc_format_string("<", stgdict->format+1); sw_dict->format = _ctypes_alloc_format_string("<", stgdict->format+1);
#else #else
PyObject_SetAttrString((PyObject *)result, "__ctype_be__", swapped); PyObject_SetAttrString((PyObject *)result, "__ctype_be__", swapped);
PyObject_SetAttrString((PyObject *)result, "__ctype_le__", (PyObject *)result); PyObject_SetAttrString((PyObject *)result, "__ctype_le__", (PyObject *)result);
PyObject_SetAttrString(swapped, "__ctype_le__", (PyObject *)result); PyObject_SetAttrString(swapped, "__ctype_le__", (PyObject *)result);
PyObject_SetAttrString(swapped, "__ctype_be__", swapped); PyObject_SetAttrString(swapped, "__ctype_be__", swapped);
/* We are creating the type for the OTHER endian */ /* We are creating the type for the OTHER endian */
sw_dict->format = alloc_format_string(">", stgdict->format+1); sw_dict->format = _ctypes_alloc_format_string(">", stgdict->format+1);
#endif #endif
Py_DECREF(swapped); Py_DECREF(swapped);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
...@@ -1994,7 +1994,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1994,7 +1994,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
* Convert a parameter into something that ConvParam can handle. * Convert a parameter into something that ConvParam can handle.
*/ */
static PyObject * static PyObject *
SimpleType_from_param(PyObject *type, PyObject *value) PyCSimpleType_from_param(PyObject *type, PyObject *value)
{ {
StgDictObject *dict; StgDictObject *dict;
char *fmt; char *fmt;
...@@ -2016,10 +2016,10 @@ SimpleType_from_param(PyObject *type, PyObject *value) ...@@ -2016,10 +2016,10 @@ SimpleType_from_param(PyObject *type, PyObject *value)
fmt = _PyUnicode_AsString(dict->proto); fmt = _PyUnicode_AsString(dict->proto);
assert(fmt); assert(fmt);
fd = getentry(fmt); fd = _ctypes_get_fielddesc(fmt);
assert(fd); assert(fd);
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
...@@ -2033,7 +2033,7 @@ SimpleType_from_param(PyObject *type, PyObject *value) ...@@ -2033,7 +2033,7 @@ SimpleType_from_param(PyObject *type, PyObject *value)
as_parameter = PyObject_GetAttrString(value, "_as_parameter_"); as_parameter = PyObject_GetAttrString(value, "_as_parameter_");
if (as_parameter) { if (as_parameter) {
value = SimpleType_from_param(type, as_parameter); value = PyCSimpleType_from_param(type, as_parameter);
Py_DECREF(as_parameter); Py_DECREF(as_parameter);
return value; return value;
} }
...@@ -2042,8 +2042,8 @@ SimpleType_from_param(PyObject *type, PyObject *value) ...@@ -2042,8 +2042,8 @@ SimpleType_from_param(PyObject *type, PyObject *value)
return NULL; return NULL;
} }
static PyMethodDef SimpleType_methods[] = { static PyMethodDef PyCSimpleType_methods[] = {
{ "from_param", SimpleType_from_param, METH_O, from_param_doc }, { "from_param", PyCSimpleType_from_param, METH_O, from_param_doc },
{ "from_address", CDataType_from_address, METH_O, from_address_doc }, { "from_address", CDataType_from_address, METH_O, from_address_doc },
{ "from_buffer", CDataType_from_buffer, METH_VARARGS, from_buffer_doc, }, { "from_buffer", CDataType_from_buffer, METH_VARARGS, from_buffer_doc, },
{ "from_buffer_copy", CDataType_from_buffer_copy, METH_VARARGS, from_buffer_copy_doc, }, { "from_buffer_copy", CDataType_from_buffer_copy, METH_VARARGS, from_buffer_copy_doc, },
...@@ -2051,9 +2051,9 @@ static PyMethodDef SimpleType_methods[] = { ...@@ -2051,9 +2051,9 @@ static PyMethodDef SimpleType_methods[] = {
{ NULL, NULL }, { NULL, NULL },
}; };
PyTypeObject SimpleType_Type = { PyTypeObject PyCSimpleType_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.SimpleType", /* tp_name */ "_ctypes.PyCSimpleType", /* tp_name */
0, /* tp_basicsize */ 0, /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
...@@ -2072,14 +2072,14 @@ PyTypeObject SimpleType_Type = { ...@@ -2072,14 +2072,14 @@ PyTypeObject SimpleType_Type = {
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"metatype for the SimpleType Objects", /* tp_doc */ "metatype for the PyCSimpleType Objects", /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
SimpleType_methods, /* tp_methods */ PyCSimpleType_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
...@@ -2089,13 +2089,13 @@ PyTypeObject SimpleType_Type = { ...@@ -2089,13 +2089,13 @@ PyTypeObject SimpleType_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
SimpleType_new, /* tp_new */ PyCSimpleType_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
CFuncPtrType_Type PyCFuncPtrType_Type
*/ */
static PyObject * static PyObject *
...@@ -2147,7 +2147,7 @@ make_funcptrtype_dict(StgDictObject *stgdict) ...@@ -2147,7 +2147,7 @@ make_funcptrtype_dict(StgDictObject *stgdict)
PyObject *ob; PyObject *ob;
PyObject *converters = NULL; PyObject *converters = NULL;
stgdict->align = getentry("P")->pffi_type->alignment; stgdict->align = _ctypes_get_fielddesc("P")->pffi_type->alignment;
stgdict->length = 1; stgdict->length = 1;
stgdict->size = sizeof(void *); stgdict->size = sizeof(void *);
stgdict->setfunc = NULL; stgdict->setfunc = NULL;
...@@ -2207,11 +2207,11 @@ make_funcptrtype_dict(StgDictObject *stgdict) ...@@ -2207,11 +2207,11 @@ make_funcptrtype_dict(StgDictObject *stgdict)
} }
static PyCArgObject * static PyCArgObject *
CFuncPtrType_paramfunc(CDataObject *self) PyCFuncPtrType_paramfunc(CDataObject *self)
{ {
PyCArgObject *parg; PyCArgObject *parg;
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
...@@ -2224,24 +2224,24 @@ CFuncPtrType_paramfunc(CDataObject *self) ...@@ -2224,24 +2224,24 @@ CFuncPtrType_paramfunc(CDataObject *self)
} }
static PyObject * static PyObject *
CFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
PyTypeObject *result; PyTypeObject *result;
StgDictObject *stgdict; StgDictObject *stgdict;
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)PyObject_CallObject(
(PyObject *)&StgDict_Type, NULL); (PyObject *)&PyCStgDict_Type, NULL);
if (!stgdict) if (!stgdict)
return NULL; return NULL;
stgdict->paramfunc = CFuncPtrType_paramfunc; stgdict->paramfunc = PyCFuncPtrType_paramfunc;
/* We do NOT expose the function signature in the format string. It /* We do NOT expose the function signature in the format string. It
is impossible, generally, because the only requirement for the is impossible, generally, because the only requirement for the
argtypes items is that they have a .from_param method - we do not argtypes items is that they have a .from_param method - we do not
know the types of the arguments (although, in practice, most know the types of the arguments (although, in practice, most
argtypes would be a ctypes type). argtypes would be a ctypes type).
*/ */
stgdict->format = alloc_format_string(NULL, "X{}"); stgdict->format = _ctypes_alloc_format_string(NULL, "X{}");
stgdict->flags |= TYPEFLAG_ISPOINTER; stgdict->flags |= TYPEFLAG_ISPOINTER;
/* create the new instance (which is a class, /* create the new instance (which is a class,
...@@ -2269,9 +2269,9 @@ CFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -2269,9 +2269,9 @@ CFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return (PyObject *)result; return (PyObject *)result;
} }
PyTypeObject CFuncPtrType_Type = { PyTypeObject PyCFuncPtrType_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.CFuncPtrType", /* tp_name */ "_ctypes.PyCFuncPtrType", /* tp_name */
0, /* tp_basicsize */ 0, /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
...@@ -2307,7 +2307,7 @@ PyTypeObject CFuncPtrType_Type = { ...@@ -2307,7 +2307,7 @@ PyTypeObject CFuncPtrType_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
CFuncPtrType_new, /* tp_new */ PyCFuncPtrType_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
...@@ -2317,7 +2317,7 @@ PyTypeObject CFuncPtrType_Type = { ...@@ -2317,7 +2317,7 @@ PyTypeObject CFuncPtrType_Type = {
*/ */
static CDataObject * static CDataObject *
CData_GetContainer(CDataObject *self) PyCData_GetContainer(CDataObject *self)
{ {
while (self->b_base) while (self->b_base)
self = self->b_base; self = self->b_base;
...@@ -2335,7 +2335,7 @@ CData_GetContainer(CDataObject *self) ...@@ -2335,7 +2335,7 @@ CData_GetContainer(CDataObject *self)
static PyObject * static PyObject *
GetKeepedObjects(CDataObject *target) GetKeepedObjects(CDataObject *target)
{ {
return CData_GetContainer(target)->b_objects; return PyCData_GetContainer(target)->b_objects;
} }
static PyObject * static PyObject *
...@@ -2391,7 +2391,7 @@ KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep) ...@@ -2391,7 +2391,7 @@ KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep)
Py_DECREF(Py_None); Py_DECREF(Py_None);
return 0; return 0;
} }
ob = CData_GetContainer(target); ob = PyCData_GetContainer(target);
if (ob->b_objects == NULL || !PyDict_CheckExact(ob->b_objects)) { if (ob->b_objects == NULL || !PyDict_CheckExact(ob->b_objects)) {
Py_XDECREF(ob->b_objects); Py_XDECREF(ob->b_objects);
ob->b_objects = keep; /* refcount consumed */ ob->b_objects = keep; /* refcount consumed */
...@@ -2410,10 +2410,10 @@ KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep) ...@@ -2410,10 +2410,10 @@ KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep)
/******************************************************************/ /******************************************************************/
/* /*
CData_Type PyCData_Type
*/ */
static int static int
CData_traverse(CDataObject *self, visitproc visit, void *arg) PyCData_traverse(CDataObject *self, visitproc visit, void *arg)
{ {
Py_VISIT(self->b_objects); Py_VISIT(self->b_objects);
Py_VISIT((PyObject *)self->b_base); Py_VISIT((PyObject *)self->b_base);
...@@ -2421,7 +2421,7 @@ CData_traverse(CDataObject *self, visitproc visit, void *arg) ...@@ -2421,7 +2421,7 @@ CData_traverse(CDataObject *self, visitproc visit, void *arg)
} }
static int static int
CData_clear(CDataObject *self) PyCData_clear(CDataObject *self)
{ {
StgDictObject *dict = PyObject_stgdict((PyObject *)self); StgDictObject *dict = PyObject_stgdict((PyObject *)self);
assert(dict); /* Cannot be NULL for CDataObject instances */ assert(dict); /* Cannot be NULL for CDataObject instances */
...@@ -2435,13 +2435,13 @@ CData_clear(CDataObject *self) ...@@ -2435,13 +2435,13 @@ CData_clear(CDataObject *self)
} }
static void static void
CData_dealloc(PyObject *self) PyCData_dealloc(PyObject *self)
{ {
CData_clear((CDataObject *)self); PyCData_clear((CDataObject *)self);
Py_TYPE(self)->tp_free(self); Py_TYPE(self)->tp_free(self);
} }
static PyMemberDef CData_members[] = { static PyMemberDef PyCData_members[] = {
{ "_b_base_", T_OBJECT, { "_b_base_", T_OBJECT,
offsetof(CDataObject, b_base), READONLY, offsetof(CDataObject, b_base), READONLY,
"the base object" }, "the base object" },
...@@ -2454,7 +2454,7 @@ static PyMemberDef CData_members[] = { ...@@ -2454,7 +2454,7 @@ static PyMemberDef CData_members[] = {
{ NULL }, { NULL },
}; };
static int CData_GetBuffer(PyObject *_self, Py_buffer *view, int flags) static int PyCData_NewGetBuffer(PyObject *_self, Py_buffer *view, int flags)
{ {
CDataObject *self = (CDataObject *)_self; CDataObject *self = (CDataObject *)_self;
StgDictObject *dict = PyObject_stgdict(_self); StgDictObject *dict = PyObject_stgdict(_self);
...@@ -2481,8 +2481,8 @@ static int CData_GetBuffer(PyObject *_self, Py_buffer *view, int flags) ...@@ -2481,8 +2481,8 @@ static int CData_GetBuffer(PyObject *_self, Py_buffer *view, int flags)
return 0; return 0;
} }
static PyBufferProcs CData_as_buffer = { static PyBufferProcs PyCData_as_buffer = {
CData_GetBuffer, PyCData_NewGetBuffer,
NULL, NULL,
}; };
...@@ -2490,14 +2490,14 @@ static PyBufferProcs CData_as_buffer = { ...@@ -2490,14 +2490,14 @@ static PyBufferProcs CData_as_buffer = {
* CData objects are mutable, so they cannot be hashable! * CData objects are mutable, so they cannot be hashable!
*/ */
static long static long
CData_nohash(PyObject *self) PyCData_nohash(PyObject *self)
{ {
PyErr_SetString(PyExc_TypeError, "unhashable type"); PyErr_SetString(PyExc_TypeError, "unhashable type");
return -1; return -1;
} }
static PyObject * static PyObject *
CData_reduce(PyObject *_self, PyObject *args) PyCData_reduce(PyObject *_self, PyObject *args)
{ {
CDataObject *self = (CDataObject *)_self; CDataObject *self = (CDataObject *)_self;
...@@ -2514,7 +2514,7 @@ CData_reduce(PyObject *_self, PyObject *args) ...@@ -2514,7 +2514,7 @@ CData_reduce(PyObject *_self, PyObject *args)
} }
static PyObject * static PyObject *
CData_setstate(PyObject *_self, PyObject *args) PyCData_setstate(PyObject *_self, PyObject *args)
{ {
void *data; void *data;
Py_ssize_t len; Py_ssize_t len;
...@@ -2539,25 +2539,25 @@ CData_setstate(PyObject *_self, PyObject *args) ...@@ -2539,25 +2539,25 @@ CData_setstate(PyObject *_self, PyObject *args)
* default __ctypes_from_outparam__ method returns self. * default __ctypes_from_outparam__ method returns self.
*/ */
static PyObject * static PyObject *
CData_from_outparam(PyObject *self, PyObject *args) PyCData_from_outparam(PyObject *self, PyObject *args)
{ {
Py_INCREF(self); Py_INCREF(self);
return self; return self;
} }
static PyMethodDef CData_methods[] = { static PyMethodDef PyCData_methods[] = {
{ "__ctypes_from_outparam__", CData_from_outparam, METH_NOARGS, }, { "__ctypes_from_outparam__", PyCData_from_outparam, METH_NOARGS, },
{ "__reduce__", CData_reduce, METH_NOARGS, }, { "__reduce__", PyCData_reduce, METH_NOARGS, },
{ "__setstate__", CData_setstate, METH_VARARGS, }, { "__setstate__", PyCData_setstate, METH_VARARGS, },
{ NULL, NULL }, { NULL, NULL },
}; };
PyTypeObject CData_Type = { PyTypeObject PyCData_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes._CData", "_ctypes._CData",
sizeof(CDataObject), /* tp_basicsize */ sizeof(CDataObject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
CData_dealloc, /* tp_dealloc */ PyCData_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
...@@ -2566,22 +2566,22 @@ PyTypeObject CData_Type = { ...@@ -2566,22 +2566,22 @@ PyTypeObject CData_Type = {
0, /* tp_as_number */ 0, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
CData_nohash, /* tp_hash */ PyCData_nohash, /* tp_hash */
0, /* tp_call */ 0, /* tp_call */
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"XXX to be provided", /* tp_doc */ "XXX to be provided", /* tp_doc */
(traverseproc)CData_traverse, /* tp_traverse */ (traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)CData_clear, /* tp_clear */ (inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
CData_methods, /* tp_methods */ PyCData_methods, /* tp_methods */
CData_members, /* tp_members */ PyCData_members, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
0, /* tp_dict */ 0, /* tp_dict */
...@@ -2594,7 +2594,7 @@ PyTypeObject CData_Type = { ...@@ -2594,7 +2594,7 @@ PyTypeObject CData_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
static int CData_MallocBuffer(CDataObject *obj, StgDictObject *dict) static int PyCData_MallocBuffer(CDataObject *obj, StgDictObject *dict)
{ {
if ((size_t)dict->size <= sizeof(obj->b_value)) { if ((size_t)dict->size <= sizeof(obj->b_value)) {
/* No need to call malloc, can use the default buffer */ /* No need to call malloc, can use the default buffer */
...@@ -2623,7 +2623,7 @@ static int CData_MallocBuffer(CDataObject *obj, StgDictObject *dict) ...@@ -2623,7 +2623,7 @@ static int CData_MallocBuffer(CDataObject *obj, StgDictObject *dict)
} }
PyObject * PyObject *
CData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr) PyCData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr)
{ {
CDataObject *cmem; CDataObject *cmem;
StgDictObject *dict; StgDictObject *dict;
...@@ -2651,7 +2651,7 @@ CData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr) ...@@ -2651,7 +2651,7 @@ CData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr)
cmem->b_base = (CDataObject *)base; cmem->b_base = (CDataObject *)base;
cmem->b_index = index; cmem->b_index = index;
} else { /* copy contents of adr */ } else { /* copy contents of adr */
if (-1 == CData_MallocBuffer(cmem, dict)) { if (-1 == PyCData_MallocBuffer(cmem, dict)) {
return NULL; return NULL;
Py_DECREF(cmem); Py_DECREF(cmem);
} }
...@@ -2665,7 +2665,7 @@ CData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr) ...@@ -2665,7 +2665,7 @@ CData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr)
Box a memory block into a CData instance. Box a memory block into a CData instance.
*/ */
PyObject * PyObject *
CData_AtAddress(PyObject *type, void *buf) PyCData_AtAddress(PyObject *type, void *buf)
{ {
CDataObject *pd; CDataObject *pd;
StgDictObject *dict; StgDictObject *dict;
...@@ -2694,17 +2694,17 @@ CData_AtAddress(PyObject *type, void *buf) ...@@ -2694,17 +2694,17 @@ CData_AtAddress(PyObject *type, void *buf)
classes. FALSE otherwise FALSE also for subclasses of c_int and classes. FALSE otherwise FALSE also for subclasses of c_int and
such. such.
*/ */
int IsSimpleSubType(PyObject *obj) int _ctypes_simple_instance(PyObject *obj)
{ {
PyTypeObject *type = (PyTypeObject *)obj; PyTypeObject *type = (PyTypeObject *)obj;
if (SimpleTypeObject_Check(type)) if (PyCSimpleTypeObject_Check(type))
return type->tp_base != &Simple_Type; return type->tp_base != &Simple_Type;
return 0; return 0;
} }
PyObject * PyObject *
CData_get(PyObject *type, GETFUNC getfunc, PyObject *src, PyCData_get(PyObject *type, GETFUNC getfunc, PyObject *src,
Py_ssize_t index, Py_ssize_t size, char *adr) Py_ssize_t index, Py_ssize_t size, char *adr)
{ {
StgDictObject *dict; StgDictObject *dict;
...@@ -2712,16 +2712,16 @@ CData_get(PyObject *type, GETFUNC getfunc, PyObject *src, ...@@ -2712,16 +2712,16 @@ CData_get(PyObject *type, GETFUNC getfunc, PyObject *src,
return getfunc(adr, size); return getfunc(adr, size);
assert(type); assert(type);
dict = PyType_stgdict(type); dict = PyType_stgdict(type);
if (dict && dict->getfunc && !IsSimpleSubType(type)) if (dict && dict->getfunc && !_ctypes_simple_instance(type))
return dict->getfunc(adr, size); return dict->getfunc(adr, size);
return CData_FromBaseObj(type, src, index, adr); return PyCData_FromBaseObj(type, src, index, adr);
} }
/* /*
Helper function for CData_set below. Helper function for PyCData_set below.
*/ */
static PyObject * static PyObject *
_CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, _PyCData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
Py_ssize_t size, char *ptr) Py_ssize_t size, char *ptr)
{ {
CDataObject *src; CDataObject *src;
...@@ -2743,15 +2743,15 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, ...@@ -2743,15 +2743,15 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
PyObject *result; PyObject *result;
ob = PyObject_CallObject(type, value); ob = PyObject_CallObject(type, value);
if (ob == NULL) { if (ob == NULL) {
Extend_Error_Info(PyExc_RuntimeError, "(%s) ", _ctypes_extend_error(PyExc_RuntimeError, "(%s) ",
((PyTypeObject *)type)->tp_name); ((PyTypeObject *)type)->tp_name);
return NULL; return NULL;
} }
result = _CData_set(dst, type, setfunc, ob, result = _PyCData_set(dst, type, setfunc, ob,
size, ptr); size, ptr);
Py_DECREF(ob); Py_DECREF(ob);
return result; return result;
} else if (value == Py_None && PointerTypeObject_Check(type)) { } else if (value == Py_None && PyCPointerTypeObject_Check(type)) {
*(void **)ptr = NULL; *(void **)ptr = NULL;
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
...@@ -2770,7 +2770,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, ...@@ -2770,7 +2770,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
src->b_ptr, src->b_ptr,
size); size);
if (PointerTypeObject_Check(type)) if (PyCPointerTypeObject_Check(type))
/* XXX */; /* XXX */;
value = GetKeepedObjects(src); value = GetKeepedObjects(src);
...@@ -2778,7 +2778,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, ...@@ -2778,7 +2778,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
return value; return value;
} }
if (PointerTypeObject_Check(type) if (PyCPointerTypeObject_Check(type)
&& ArrayObject_Check(value)) { && ArrayObject_Check(value)) {
StgDictObject *p1, *p2; StgDictObject *p1, *p2;
PyObject *keep; PyObject *keep;
...@@ -2819,7 +2819,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, ...@@ -2819,7 +2819,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
* to the value 'value'. * to the value 'value'.
*/ */
int int
CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, PyCData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
Py_ssize_t index, Py_ssize_t size, char *ptr) Py_ssize_t index, Py_ssize_t size, char *ptr)
{ {
CDataObject *mem = (CDataObject *)dst; CDataObject *mem = (CDataObject *)dst;
...@@ -2831,7 +2831,7 @@ CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, ...@@ -2831,7 +2831,7 @@ CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
return -1; return -1;
} }
result = _CData_set(mem, type, setfunc, value, result = _PyCData_set(mem, type, setfunc, value,
size, ptr); size, ptr);
if (result == NULL) if (result == NULL)
return -1; return -1;
...@@ -2845,7 +2845,7 @@ CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, ...@@ -2845,7 +2845,7 @@ CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
/******************************************************************/ /******************************************************************/
static PyObject * static PyObject *
GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds) GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
CDataObject *obj; CDataObject *obj;
StgDictObject *dict; StgDictObject *dict;
...@@ -2867,7 +2867,7 @@ GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -2867,7 +2867,7 @@ GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
obj->b_objects = NULL; obj->b_objects = NULL;
obj->b_length = dict->length; obj->b_length = dict->length;
if (-1 == CData_MallocBuffer(obj, dict)) { if (-1 == PyCData_MallocBuffer(obj, dict)) {
Py_DECREF(obj); Py_DECREF(obj);
return NULL; return NULL;
} }
...@@ -2875,11 +2875,11 @@ GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -2875,11 +2875,11 @@ GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
/*****************************************************************/ /*****************************************************************/
/* /*
CFuncPtr_Type PyCFuncPtr_Type
*/ */
static int static int
CFuncPtr_set_errcheck(CFuncPtrObject *self, PyObject *ob) PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
{ {
if (ob && !PyCallable_Check(ob)) { if (ob && !PyCallable_Check(ob)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
...@@ -2893,7 +2893,7 @@ CFuncPtr_set_errcheck(CFuncPtrObject *self, PyObject *ob) ...@@ -2893,7 +2893,7 @@ CFuncPtr_set_errcheck(CFuncPtrObject *self, PyObject *ob)
} }
static PyObject * static PyObject *
CFuncPtr_get_errcheck(CFuncPtrObject *self) PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
{ {
if (self->errcheck) { if (self->errcheck) {
Py_INCREF(self->errcheck); Py_INCREF(self->errcheck);
...@@ -2904,7 +2904,7 @@ CFuncPtr_get_errcheck(CFuncPtrObject *self) ...@@ -2904,7 +2904,7 @@ CFuncPtr_get_errcheck(CFuncPtrObject *self)
} }
static int static int
CFuncPtr_set_restype(CFuncPtrObject *self, PyObject *ob) PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
{ {
if (ob == NULL) { if (ob == NULL) {
Py_XDECREF(self->restype); Py_XDECREF(self->restype);
...@@ -2929,7 +2929,7 @@ CFuncPtr_set_restype(CFuncPtrObject *self, PyObject *ob) ...@@ -2929,7 +2929,7 @@ CFuncPtr_set_restype(CFuncPtrObject *self, PyObject *ob)
} }
static PyObject * static PyObject *
CFuncPtr_get_restype(CFuncPtrObject *self) PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
{ {
StgDictObject *dict; StgDictObject *dict;
if (self->restype) { if (self->restype) {
...@@ -2937,7 +2937,7 @@ CFuncPtr_get_restype(CFuncPtrObject *self) ...@@ -2937,7 +2937,7 @@ CFuncPtr_get_restype(CFuncPtrObject *self)
return self->restype; return self->restype;
} }
dict = PyObject_stgdict((PyObject *)self); dict = PyObject_stgdict((PyObject *)self);
assert(dict); /* Cannot be NULL for CFuncPtrObject instances */ assert(dict); /* Cannot be NULL for PyCFuncPtrObject instances */
if (dict->restype) { if (dict->restype) {
Py_INCREF(dict->restype); Py_INCREF(dict->restype);
return dict->restype; return dict->restype;
...@@ -2948,7 +2948,7 @@ CFuncPtr_get_restype(CFuncPtrObject *self) ...@@ -2948,7 +2948,7 @@ CFuncPtr_get_restype(CFuncPtrObject *self)
} }
static int static int
CFuncPtr_set_argtypes(CFuncPtrObject *self, PyObject *ob) PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
{ {
PyObject *converters; PyObject *converters;
...@@ -2971,7 +2971,7 @@ CFuncPtr_set_argtypes(CFuncPtrObject *self, PyObject *ob) ...@@ -2971,7 +2971,7 @@ CFuncPtr_set_argtypes(CFuncPtrObject *self, PyObject *ob)
} }
static PyObject * static PyObject *
CFuncPtr_get_argtypes(CFuncPtrObject *self) PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self)
{ {
StgDictObject *dict; StgDictObject *dict;
if (self->argtypes) { if (self->argtypes) {
...@@ -2979,7 +2979,7 @@ CFuncPtr_get_argtypes(CFuncPtrObject *self) ...@@ -2979,7 +2979,7 @@ CFuncPtr_get_argtypes(CFuncPtrObject *self)
return self->argtypes; return self->argtypes;
} }
dict = PyObject_stgdict((PyObject *)self); dict = PyObject_stgdict((PyObject *)self);
assert(dict); /* Cannot be NULL for CFuncPtrObject instances */ assert(dict); /* Cannot be NULL for PyCFuncPtrObject instances */
if (dict->argtypes) { if (dict->argtypes) {
Py_INCREF(dict->argtypes); Py_INCREF(dict->argtypes);
return dict->argtypes; return dict->argtypes;
...@@ -2989,13 +2989,13 @@ CFuncPtr_get_argtypes(CFuncPtrObject *self) ...@@ -2989,13 +2989,13 @@ CFuncPtr_get_argtypes(CFuncPtrObject *self)
} }
} }
static PyGetSetDef CFuncPtr_getsets[] = { static PyGetSetDef PyCFuncPtr_getsets[] = {
{ "errcheck", (getter)CFuncPtr_get_errcheck, (setter)CFuncPtr_set_errcheck, { "errcheck", (getter)PyCFuncPtr_get_errcheck, (setter)PyCFuncPtr_set_errcheck,
"a function to check for errors", NULL }, "a function to check for errors", NULL },
{ "restype", (getter)CFuncPtr_get_restype, (setter)CFuncPtr_set_restype, { "restype", (getter)PyCFuncPtr_get_restype, (setter)PyCFuncPtr_set_restype,
"specify the result type", NULL }, "specify the result type", NULL },
{ "argtypes", (getter)CFuncPtr_get_argtypes, { "argtypes", (getter)PyCFuncPtr_get_argtypes,
(setter)CFuncPtr_set_argtypes, (setter)PyCFuncPtr_set_argtypes,
"specify the argument types", NULL }, "specify the argument types", NULL },
{ NULL, NULL } { NULL, NULL }
}; };
...@@ -3050,10 +3050,10 @@ _check_outarg_type(PyObject *arg, Py_ssize_t index) ...@@ -3050,10 +3050,10 @@ _check_outarg_type(PyObject *arg, Py_ssize_t index)
{ {
StgDictObject *dict; StgDictObject *dict;
if (PointerTypeObject_Check(arg)) if (PyCPointerTypeObject_Check(arg))
return 1; return 1;
if (ArrayTypeObject_Check(arg)) if (PyCArrayTypeObject_Check(arg))
return 1; return 1;
dict = PyType_stgdict(arg); dict = PyType_stgdict(arg);
...@@ -3083,7 +3083,7 @@ _validate_paramflags(PyTypeObject *type, PyObject *paramflags) ...@@ -3083,7 +3083,7 @@ _validate_paramflags(PyTypeObject *type, PyObject *paramflags)
PyObject *argtypes; PyObject *argtypes;
dict = PyType_stgdict((PyObject *)type); dict = PyType_stgdict((PyObject *)type);
assert(dict); /* Cannot be NULL. 'type' is a CFuncPtr type. */ assert(dict); /* Cannot be NULL. 'type' is a PyCFuncPtr type. */
argtypes = dict->argtypes; argtypes = dict->argtypes;
if (paramflags == NULL || dict->argtypes == NULL) if (paramflags == NULL || dict->argtypes == NULL)
...@@ -3161,13 +3161,13 @@ _get_name(PyObject *obj, char **pname) ...@@ -3161,13 +3161,13 @@ _get_name(PyObject *obj, char **pname)
static PyObject * static PyObject *
CFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
char *name; char *name;
int (* address)(void); int (* address)(void);
PyObject *dll; PyObject *dll;
PyObject *obj; PyObject *obj;
CFuncPtrObject *self; PyCFuncPtrObject *self;
void *handle; void *handle;
PyObject *paramflags = NULL; PyObject *paramflags = NULL;
...@@ -3223,7 +3223,7 @@ CFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3223,7 +3223,7 @@ CFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (!_validate_paramflags(type, paramflags)) if (!_validate_paramflags(type, paramflags))
return NULL; return NULL;
self = (CFuncPtrObject *)GenericCData_new(type, args, kwds); self = (PyCFuncPtrObject *)GenericPyCData_new(type, args, kwds);
if (!self) if (!self)
return NULL; return NULL;
...@@ -3245,9 +3245,9 @@ CFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3245,9 +3245,9 @@ CFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
#ifdef MS_WIN32 #ifdef MS_WIN32
static PyObject * static PyObject *
CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
CFuncPtrObject *self; PyCFuncPtrObject *self;
int index; int index;
char *name = NULL; char *name = NULL;
PyObject *paramflags = NULL; PyObject *paramflags = NULL;
...@@ -3262,7 +3262,7 @@ CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3262,7 +3262,7 @@ CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (!_validate_paramflags(type, paramflags)) if (!_validate_paramflags(type, paramflags))
return NULL; return NULL;
self = (CFuncPtrObject *)GenericCData_new(type, args, kwds); self = (PyCFuncPtrObject *)GenericPyCData_new(type, args, kwds);
self->index = index + 0x1000; self->index = index + 0x1000;
Py_XINCREF(paramflags); Py_XINCREF(paramflags);
self->paramflags = paramflags; self->paramflags = paramflags;
...@@ -3273,7 +3273,7 @@ CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3273,7 +3273,7 @@ CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds)
#endif #endif
/* /*
CFuncPtr_new accepts different argument lists in addition to the standard PyCFuncPtr_new accepts different argument lists in addition to the standard
_basespec_ keyword arg: _basespec_ keyword arg:
one argument form one argument form
...@@ -3286,22 +3286,22 @@ CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3286,22 +3286,22 @@ CFuncPtr_FromVtblIndex(PyTypeObject *type, PyObject *args, PyObject *kwds)
"is|..." - vtable index, method name, creates callable calling COM vtbl "is|..." - vtable index, method name, creates callable calling COM vtbl
*/ */
static PyObject * static PyObject *
CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
CFuncPtrObject *self; PyCFuncPtrObject *self;
PyObject *callable; PyObject *callable;
StgDictObject *dict; StgDictObject *dict;
CThunkObject *thunk; CThunkObject *thunk;
if (PyTuple_GET_SIZE(args) == 0) if (PyTuple_GET_SIZE(args) == 0)
return GenericCData_new(type, args, kwds); return GenericPyCData_new(type, args, kwds);
if (1 <= PyTuple_GET_SIZE(args) && PyTuple_Check(PyTuple_GET_ITEM(args, 0))) if (1 <= PyTuple_GET_SIZE(args) && PyTuple_Check(PyTuple_GET_ITEM(args, 0)))
return CFuncPtr_FromDll(type, args, kwds); return PyCFuncPtr_FromDll(type, args, kwds);
#ifdef MS_WIN32 #ifdef MS_WIN32
if (2 <= PyTuple_GET_SIZE(args) && PyLong_Check(PyTuple_GET_ITEM(args, 0))) if (2 <= PyTuple_GET_SIZE(args) && PyLong_Check(PyTuple_GET_ITEM(args, 0)))
return CFuncPtr_FromVtblIndex(type, args, kwds); return PyCFuncPtr_FromVtblIndex(type, args, kwds);
#endif #endif
if (1 == PyTuple_GET_SIZE(args) if (1 == PyTuple_GET_SIZE(args)
...@@ -3310,7 +3310,7 @@ CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3310,7 +3310,7 @@ CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
void *ptr = PyLong_AsVoidPtr(PyTuple_GET_ITEM(args, 0)); void *ptr = PyLong_AsVoidPtr(PyTuple_GET_ITEM(args, 0));
if (ptr == NULL && PyErr_Occurred()) if (ptr == NULL && PyErr_Occurred())
return NULL; return NULL;
ob = (CDataObject *)GenericCData_new(type, args, kwds); ob = (CDataObject *)GenericPyCData_new(type, args, kwds);
if (ob == NULL) if (ob == NULL)
return NULL; return NULL;
*(void **)ob->b_ptr = ptr; *(void **)ob->b_ptr = ptr;
...@@ -3339,7 +3339,7 @@ CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3339,7 +3339,7 @@ CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
*/ */
dict = PyType_stgdict((PyObject *)type); dict = PyType_stgdict((PyObject *)type);
/* XXXX Fails if we do: 'CFuncPtr(lambda x: x)' */ /* XXXX Fails if we do: 'PyCFuncPtr(lambda x: x)' */
if (!dict || !dict->argtypes) { if (!dict || !dict->argtypes) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"cannot construct instance of this class:" "cannot construct instance of this class:"
...@@ -3347,14 +3347,14 @@ CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -3347,14 +3347,14 @@ CFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
thunk = AllocFunctionCallback(callable, thunk = _ctypes_alloc_callback(callable,
dict->argtypes, dict->argtypes,
dict->restype, dict->restype,
dict->flags); dict->flags);
if (!thunk) if (!thunk)
return NULL; return NULL;
self = (CFuncPtrObject *)GenericCData_new(type, args, kwds); self = (PyCFuncPtrObject *)GenericPyCData_new(type, args, kwds);
if (self == NULL) { if (self == NULL) {
Py_DECREF(thunk); Py_DECREF(thunk);
return NULL; return NULL;
...@@ -3388,7 +3388,7 @@ _byref(PyObject *obj) ...@@ -3388,7 +3388,7 @@ _byref(PyObject *obj)
return NULL; return NULL;
} }
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) { if (parg == NULL) {
Py_DECREF(obj); Py_DECREF(obj);
return NULL; return NULL;
...@@ -3450,7 +3450,7 @@ _get_arg(int *pindex, PyObject *name, PyObject *defval, PyObject *inargs, PyObje ...@@ -3450,7 +3450,7 @@ _get_arg(int *pindex, PyObject *name, PyObject *defval, PyObject *inargs, PyObje
function. function.
*/ */
static PyObject * static PyObject *
_build_callargs(CFuncPtrObject *self, PyObject *argtypes, _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes,
PyObject *inargs, PyObject *kwds, PyObject *inargs, PyObject *kwds,
int *poutmask, int *pinoutmask, unsigned int *pnumretvals) int *poutmask, int *pinoutmask, unsigned int *pnumretvals)
{ {
...@@ -3562,7 +3562,7 @@ _build_callargs(CFuncPtrObject *self, PyObject *argtypes, ...@@ -3562,7 +3562,7 @@ _build_callargs(CFuncPtrObject *self, PyObject *argtypes,
((PyTypeObject *)ob)->tp_name); ((PyTypeObject *)ob)->tp_name);
goto error; goto error;
} }
if (ArrayTypeObject_Check(ob)) if (PyCArrayTypeObject_Check(ob))
ob = PyObject_CallObject(ob, NULL); ob = PyObject_CallObject(ob, NULL);
else else
/* Create an instance of the pointed-to type */ /* Create an instance of the pointed-to type */
...@@ -3678,7 +3678,7 @@ _build_result(PyObject *result, PyObject *callargs, ...@@ -3678,7 +3678,7 @@ _build_result(PyObject *result, PyObject *callargs,
} }
static PyObject * static PyObject *
CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds) PyCFuncPtr_call(PyCFuncPtrObject *self, PyObject *inargs, PyObject *kwds)
{ {
PyObject *restype; PyObject *restype;
PyObject *converters; PyObject *converters;
...@@ -3697,7 +3697,7 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds) ...@@ -3697,7 +3697,7 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds)
int outmask; int outmask;
unsigned int numretvals; unsigned int numretvals;
assert(dict); /* Cannot be NULL for CFuncPtrObject instances */ assert(dict); /* Cannot be NULL for PyCFuncPtrObject instances */
restype = self->restype ? self->restype : dict->restype; restype = self->restype ? self->restype : dict->restype;
converters = self->converters ? self->converters : dict->converters; converters = self->converters ? self->converters : dict->converters;
checker = self->checker ? self->checker : dict->checker; checker = self->checker ? self->checker : dict->checker;
...@@ -3774,7 +3774,7 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds) ...@@ -3774,7 +3774,7 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds)
} }
} }
result = _CallProc(pProc, result = _ctypes_callproc(pProc,
callargs, callargs,
#ifdef MS_WIN32 #ifdef MS_WIN32
piunk, piunk,
...@@ -3810,7 +3810,7 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds) ...@@ -3810,7 +3810,7 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds)
} }
static int static int
CFuncPtr_traverse(CFuncPtrObject *self, visitproc visit, void *arg) PyCFuncPtr_traverse(PyCFuncPtrObject *self, visitproc visit, void *arg)
{ {
Py_VISIT(self->callable); Py_VISIT(self->callable);
Py_VISIT(self->restype); Py_VISIT(self->restype);
...@@ -3820,11 +3820,11 @@ CFuncPtr_traverse(CFuncPtrObject *self, visitproc visit, void *arg) ...@@ -3820,11 +3820,11 @@ CFuncPtr_traverse(CFuncPtrObject *self, visitproc visit, void *arg)
Py_VISIT(self->converters); Py_VISIT(self->converters);
Py_VISIT(self->paramflags); Py_VISIT(self->paramflags);
Py_VISIT(self->thunk); Py_VISIT(self->thunk);
return CData_traverse((CDataObject *)self, visit, arg); return PyCData_traverse((CDataObject *)self, visit, arg);
} }
static int static int
CFuncPtr_clear(CFuncPtrObject *self) PyCFuncPtr_clear(PyCFuncPtrObject *self)
{ {
Py_CLEAR(self->callable); Py_CLEAR(self->callable);
Py_CLEAR(self->restype); Py_CLEAR(self->restype);
...@@ -3834,18 +3834,18 @@ CFuncPtr_clear(CFuncPtrObject *self) ...@@ -3834,18 +3834,18 @@ CFuncPtr_clear(CFuncPtrObject *self)
Py_CLEAR(self->converters); Py_CLEAR(self->converters);
Py_CLEAR(self->paramflags); Py_CLEAR(self->paramflags);
Py_CLEAR(self->thunk); Py_CLEAR(self->thunk);
return CData_clear((CDataObject *)self); return PyCData_clear((CDataObject *)self);
} }
static void static void
CFuncPtr_dealloc(CFuncPtrObject *self) PyCFuncPtr_dealloc(PyCFuncPtrObject *self)
{ {
CFuncPtr_clear(self); PyCFuncPtr_clear(self);
Py_TYPE(self)->tp_free((PyObject *)self); Py_TYPE(self)->tp_free((PyObject *)self);
} }
static PyObject * static PyObject *
CFuncPtr_repr(CFuncPtrObject *self) PyCFuncPtr_repr(PyCFuncPtrObject *self)
{ {
#ifdef MS_WIN32 #ifdef MS_WIN32
if (self->index) if (self->index)
...@@ -3860,7 +3860,7 @@ CFuncPtr_repr(CFuncPtrObject *self) ...@@ -3860,7 +3860,7 @@ CFuncPtr_repr(CFuncPtrObject *self)
} }
static int static int
CFuncPtr_bool(CFuncPtrObject *self) PyCFuncPtr_bool(PyCFuncPtrObject *self)
{ {
return ((*(void **)self->b_ptr != NULL) return ((*(void **)self->b_ptr != NULL)
#ifdef MS_WIN32 #ifdef MS_WIN32
...@@ -3869,7 +3869,7 @@ CFuncPtr_bool(CFuncPtrObject *self) ...@@ -3869,7 +3869,7 @@ CFuncPtr_bool(CFuncPtrObject *self)
); );
} }
static PyNumberMethods CFuncPtr_as_number = { static PyNumberMethods PyCFuncPtr_as_number = {
0, /* nb_add */ 0, /* nb_add */
0, /* nb_subtract */ 0, /* nb_subtract */
0, /* nb_multiply */ 0, /* nb_multiply */
...@@ -3879,40 +3879,40 @@ static PyNumberMethods CFuncPtr_as_number = { ...@@ -3879,40 +3879,40 @@ static PyNumberMethods CFuncPtr_as_number = {
0, /* nb_negative */ 0, /* nb_negative */
0, /* nb_positive */ 0, /* nb_positive */
0, /* nb_absolute */ 0, /* nb_absolute */
(inquiry)CFuncPtr_bool, /* nb_bool */ (inquiry)PyCFuncPtr_bool, /* nb_bool */
}; };
PyTypeObject CFuncPtr_Type = { PyTypeObject PyCFuncPtr_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.CFuncPtr", "_ctypes.PyCFuncPtr",
sizeof(CFuncPtrObject), /* tp_basicsize */ sizeof(PyCFuncPtrObject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)CFuncPtr_dealloc, /* tp_dealloc */ (destructor)PyCFuncPtr_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_reserved */ 0, /* tp_reserved */
(reprfunc)CFuncPtr_repr, /* tp_repr */ (reprfunc)PyCFuncPtr_repr, /* tp_repr */
&CFuncPtr_as_number, /* tp_as_number */ &PyCFuncPtr_as_number, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
0, /* tp_hash */ 0, /* tp_hash */
(ternaryfunc)CFuncPtr_call, /* tp_call */ (ternaryfunc)PyCFuncPtr_call, /* tp_call */
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"Function Pointer", /* tp_doc */ "Function Pointer", /* tp_doc */
(traverseproc)CFuncPtr_traverse, /* tp_traverse */ (traverseproc)PyCFuncPtr_traverse, /* tp_traverse */
(inquiry)CFuncPtr_clear, /* tp_clear */ (inquiry)PyCFuncPtr_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
0, /* tp_methods */ 0, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */
CFuncPtr_getsets, /* tp_getset */ PyCFuncPtr_getsets, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
0, /* tp_dict */ 0, /* tp_dict */
0, /* tp_descr_get */ 0, /* tp_descr_get */
...@@ -3920,7 +3920,7 @@ PyTypeObject CFuncPtr_Type = { ...@@ -3920,7 +3920,7 @@ PyTypeObject CFuncPtr_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
CFuncPtr_new, /* tp_new */ PyCFuncPtr_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
...@@ -4044,11 +4044,11 @@ static PyTypeObject Struct_Type = { ...@@ -4044,11 +4044,11 @@ static PyTypeObject Struct_Type = {
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"Structure base class", /* tp_doc */ "Structure base class", /* tp_doc */
(traverseproc)CData_traverse, /* tp_traverse */ (traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)CData_clear, /* tp_clear */ (inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
...@@ -4063,7 +4063,7 @@ static PyTypeObject Struct_Type = { ...@@ -4063,7 +4063,7 @@ static PyTypeObject Struct_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
Struct_init, /* tp_init */ Struct_init, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
GenericCData_new, /* tp_new */ GenericPyCData_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
...@@ -4086,11 +4086,11 @@ static PyTypeObject Union_Type = { ...@@ -4086,11 +4086,11 @@ static PyTypeObject Union_Type = {
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"Union base class", /* tp_doc */ "Union base class", /* tp_doc */
(traverseproc)CData_traverse, /* tp_traverse */ (traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)CData_clear, /* tp_clear */ (inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
...@@ -4105,14 +4105,14 @@ static PyTypeObject Union_Type = { ...@@ -4105,14 +4105,14 @@ static PyTypeObject Union_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
Struct_init, /* tp_init */ Struct_init, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
GenericCData_new, /* tp_new */ GenericPyCData_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
Array_Type PyCArray_Type
*/ */
static int static int
Array_init(CDataObject *self, PyObject *args, PyObject *kw) Array_init(CDataObject *self, PyObject *args, PyObject *kw)
...@@ -4157,7 +4157,7 @@ Array_item(PyObject *_self, Py_ssize_t index) ...@@ -4157,7 +4157,7 @@ Array_item(PyObject *_self, Py_ssize_t index)
size = stgdict->size / stgdict->length; size = stgdict->size / stgdict->length;
offset = index * size; offset = index * size;
return CData_get(stgdict->proto, stgdict->getfunc, (PyObject *)self, return PyCData_get(stgdict->proto, stgdict->getfunc, (PyObject *)self,
index, size, self->b_ptr + offset); index, size, self->b_ptr + offset);
} }
...@@ -4194,7 +4194,7 @@ Array_subscript(PyObject *_self, PyObject *item) ...@@ -4194,7 +4194,7 @@ Array_subscript(PyObject *_self, PyObject *item)
assert(itemdict); /* proto is the item type of the array, a assert(itemdict); /* proto is the item type of the array, a
ctypes type, so this cannot be NULL */ ctypes type, so this cannot be NULL */
if (itemdict->getfunc == getentry("c")->getfunc) { if (itemdict->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
char *ptr = (char *)self->b_ptr; char *ptr = (char *)self->b_ptr;
char *dest; char *dest;
...@@ -4219,7 +4219,7 @@ Array_subscript(PyObject *_self, PyObject *item) ...@@ -4219,7 +4219,7 @@ Array_subscript(PyObject *_self, PyObject *item)
return np; return np;
} }
#ifdef CTYPES_UNICODE #ifdef CTYPES_UNICODE
if (itemdict->getfunc == getentry("u")->getfunc) { if (itemdict->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
wchar_t *ptr = (wchar_t *)self->b_ptr; wchar_t *ptr = (wchar_t *)self->b_ptr;
wchar_t *dest; wchar_t *dest;
...@@ -4288,7 +4288,7 @@ Array_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value) ...@@ -4288,7 +4288,7 @@ Array_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
offset = index * size; offset = index * size;
ptr = self->b_ptr + offset; ptr = self->b_ptr + offset;
return CData_set((PyObject *)self, stgdict->proto, stgdict->setfunc, value, return PyCData_set((PyObject *)self, stgdict->proto, stgdict->setfunc, value,
index, size, ptr); index, size, ptr);
} }
...@@ -4376,7 +4376,7 @@ static PyMappingMethods Array_as_mapping = { ...@@ -4376,7 +4376,7 @@ static PyMappingMethods Array_as_mapping = {
Array_ass_subscript, Array_ass_subscript,
}; };
PyTypeObject Array_Type = { PyTypeObject PyCArray_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.Array", "_ctypes.Array",
sizeof(CDataObject), /* tp_basicsize */ sizeof(CDataObject), /* tp_basicsize */
...@@ -4395,11 +4395,11 @@ PyTypeObject Array_Type = { ...@@ -4395,11 +4395,11 @@ PyTypeObject Array_Type = {
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"XXX to be provided", /* tp_doc */ "XXX to be provided", /* tp_doc */
(traverseproc)CData_traverse, /* tp_traverse */ (traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)CData_clear, /* tp_clear */ (inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
...@@ -4414,12 +4414,12 @@ PyTypeObject Array_Type = { ...@@ -4414,12 +4414,12 @@ PyTypeObject Array_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
(initproc)Array_init, /* tp_init */ (initproc)Array_init, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
GenericCData_new, /* tp_new */ GenericPyCData_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
PyObject * PyObject *
CreateArrayType(PyObject *itemtype, Py_ssize_t length) PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
{ {
static PyObject *cache; static PyObject *cache;
PyObject *key; PyObject *key;
...@@ -4459,10 +4459,10 @@ CreateArrayType(PyObject *itemtype, Py_ssize_t length) ...@@ -4459,10 +4459,10 @@ CreateArrayType(PyObject *itemtype, Py_ssize_t length)
((PyTypeObject *)itemtype)->tp_name, (long)length); ((PyTypeObject *)itemtype)->tp_name, (long)length);
#endif #endif
result = PyObject_CallFunction((PyObject *)&ArrayType_Type, result = PyObject_CallFunction((PyObject *)&PyCArrayType_Type,
"U(O){s:n,s:O}", "U(O){s:n,s:O}",
name, name,
&Array_Type, &PyCArray_Type,
"_length_", "_length_",
length, length,
"_type_", "_type_",
...@@ -4538,7 +4538,7 @@ static PyGetSetDef Simple_getsets[] = { ...@@ -4538,7 +4538,7 @@ static PyGetSetDef Simple_getsets[] = {
static PyObject * static PyObject *
Simple_from_outparm(PyObject *self, PyObject *args) Simple_from_outparm(PyObject *self, PyObject *args)
{ {
if (IsSimpleSubType((PyObject *)Py_TYPE(self))) { if (_ctypes_simple_instance((PyObject *)Py_TYPE(self))) {
Py_INCREF(self); Py_INCREF(self);
return self; return self;
} }
...@@ -4627,11 +4627,11 @@ static PyTypeObject Simple_Type = { ...@@ -4627,11 +4627,11 @@ static PyTypeObject Simple_Type = {
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"XXX to be provided", /* tp_doc */ "XXX to be provided", /* tp_doc */
(traverseproc)CData_traverse, /* tp_traverse */ (traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)CData_clear, /* tp_clear */ (inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
...@@ -4646,13 +4646,13 @@ static PyTypeObject Simple_Type = { ...@@ -4646,13 +4646,13 @@ static PyTypeObject Simple_Type = {
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
(initproc)Simple_init, /* tp_init */ (initproc)Simple_init, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
GenericCData_new, /* tp_new */ GenericPyCData_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
Pointer_Type PyCPointer_Type
*/ */
static PyObject * static PyObject *
Pointer_item(PyObject *_self, Py_ssize_t index) Pointer_item(PyObject *_self, Py_ssize_t index)
...@@ -4681,7 +4681,7 @@ Pointer_item(PyObject *_self, Py_ssize_t index) ...@@ -4681,7 +4681,7 @@ Pointer_item(PyObject *_self, Py_ssize_t index)
size = itemdict->size; size = itemdict->size;
offset = index * itemdict->size; offset = index * itemdict->size;
return CData_get(proto, stgdict->getfunc, (PyObject *)self, return PyCData_get(proto, stgdict->getfunc, (PyObject *)self,
index, size, (*(char **)self->b_ptr) + offset); index, size, (*(char **)self->b_ptr) + offset);
} }
...@@ -4719,7 +4719,7 @@ Pointer_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value) ...@@ -4719,7 +4719,7 @@ Pointer_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
size = itemdict->size; size = itemdict->size;
offset = index * itemdict->size; offset = index * itemdict->size;
return CData_set((PyObject *)self, proto, stgdict->setfunc, value, return PyCData_set((PyObject *)self, proto, stgdict->setfunc, value,
index, size, (*(char **)self->b_ptr) + offset); index, size, (*(char **)self->b_ptr) + offset);
} }
...@@ -4736,7 +4736,7 @@ Pointer_get_contents(CDataObject *self, void *closure) ...@@ -4736,7 +4736,7 @@ Pointer_get_contents(CDataObject *self, void *closure)
stgdict = PyObject_stgdict((PyObject *)self); stgdict = PyObject_stgdict((PyObject *)self);
assert(stgdict); /* Cannot be NULL fr pointer instances */ assert(stgdict); /* Cannot be NULL fr pointer instances */
return CData_FromBaseObj(stgdict->proto, return PyCData_FromBaseObj(stgdict->proto,
(PyObject *)self, 0, (PyObject *)self, 0,
*(void **)self->b_ptr); *(void **)self->b_ptr);
} }
...@@ -4811,7 +4811,7 @@ Pointer_new(PyTypeObject *type, PyObject *args, PyObject *kw) ...@@ -4811,7 +4811,7 @@ Pointer_new(PyTypeObject *type, PyObject *args, PyObject *kw)
"Cannot create instance: has no _type_"); "Cannot create instance: has no _type_");
return NULL; return NULL;
} }
return GenericCData_new(type, args, kw); return GenericPyCData_new(type, args, kw);
} }
static PyObject * static PyObject *
...@@ -4887,7 +4887,7 @@ Pointer_subscript(PyObject *_self, PyObject *item) ...@@ -4887,7 +4887,7 @@ Pointer_subscript(PyObject *_self, PyObject *item)
assert(proto); assert(proto);
itemdict = PyType_stgdict(proto); itemdict = PyType_stgdict(proto);
assert(itemdict); assert(itemdict);
if (itemdict->getfunc == getentry("c")->getfunc) { if (itemdict->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
char *ptr = *(char **)self->b_ptr; char *ptr = *(char **)self->b_ptr;
char *dest; char *dest;
...@@ -4908,7 +4908,7 @@ Pointer_subscript(PyObject *_self, PyObject *item) ...@@ -4908,7 +4908,7 @@ Pointer_subscript(PyObject *_self, PyObject *item)
return np; return np;
} }
#ifdef CTYPES_UNICODE #ifdef CTYPES_UNICODE
if (itemdict->getfunc == getentry("u")->getfunc) { if (itemdict->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
wchar_t *ptr = *(wchar_t **)self->b_ptr; wchar_t *ptr = *(wchar_t **)self->b_ptr;
wchar_t *dest; wchar_t *dest;
...@@ -4985,7 +4985,7 @@ static PyNumberMethods Pointer_as_number = { ...@@ -4985,7 +4985,7 @@ static PyNumberMethods Pointer_as_number = {
(inquiry)Pointer_bool, /* nb_bool */ (inquiry)Pointer_bool, /* nb_bool */
}; };
PyTypeObject Pointer_Type = { PyTypeObject PyCPointer_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes._Pointer", "_ctypes._Pointer",
sizeof(CDataObject), /* tp_basicsize */ sizeof(CDataObject), /* tp_basicsize */
...@@ -5004,11 +5004,11 @@ PyTypeObject Pointer_Type = { ...@@ -5004,11 +5004,11 @@ PyTypeObject Pointer_Type = {
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
&CData_as_buffer, /* tp_as_buffer */ &PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"XXX to be provided", /* tp_doc */ "XXX to be provided", /* tp_doc */
(traverseproc)CData_traverse, /* tp_traverse */ (traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)CData_clear, /* tp_clear */ (inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
...@@ -5146,9 +5146,9 @@ cast_check_pointertype(PyObject *arg) ...@@ -5146,9 +5146,9 @@ cast_check_pointertype(PyObject *arg)
{ {
StgDictObject *dict; StgDictObject *dict;
if (PointerTypeObject_Check(arg)) if (PyCPointerTypeObject_Check(arg))
return 1; return 1;
if (CFuncPtrTypeObject_Check(arg)) if (PyCFuncPtrTypeObject_Check(arg))
return 1; return 1;
dict = PyType_stgdict(arg); dict = PyType_stgdict(arg);
if (dict) { if (dict) {
...@@ -5184,9 +5184,9 @@ cast(void *ptr, PyObject *src, PyObject *ctype) ...@@ -5184,9 +5184,9 @@ cast(void *ptr, PyObject *src, PyObject *ctype)
*/ */
if (CDataObject_Check(src)) { if (CDataObject_Check(src)) {
CDataObject *obj = (CDataObject *)src; CDataObject *obj = (CDataObject *)src;
/* CData_GetContainer will initialize src.b_objects, we need /* PyCData_GetContainer will initialize src.b_objects, we need
this so it can be shared */ this so it can be shared */
CData_GetContainer(obj); PyCData_GetContainer(obj);
/* But we need a dictionary! */ /* But we need a dictionary! */
if (obj->b_objects == Py_None) { if (obj->b_objects == Py_None) {
Py_DECREF(Py_None); Py_DECREF(Py_None);
...@@ -5234,7 +5234,7 @@ static struct PyModuleDef _ctypesmodule = { ...@@ -5234,7 +5234,7 @@ static struct PyModuleDef _ctypesmodule = {
"_ctypes", "_ctypes",
module_docs, module_docs,
-1, -1,
module_methods, _ctypes_module_methods,
NULL, NULL,
NULL, NULL,
NULL, NULL,
...@@ -5257,11 +5257,11 @@ PyInit__ctypes(void) ...@@ -5257,11 +5257,11 @@ PyInit__ctypes(void)
if (!m) if (!m)
return NULL; return NULL;
_pointer_type_cache = PyDict_New(); _ctypes_ptrtype_cache = PyDict_New();
if (_pointer_type_cache == NULL) if (_ctypes_ptrtype_cache == NULL)
return NULL; return NULL;
PyModule_AddObject(m, "_pointer_type_cache", (PyObject *)_pointer_type_cache); PyModule_AddObject(m, "_pointer_type_cache", (PyObject *)_ctypes_ptrtype_cache);
_unpickle = PyObject_GetAttrString(m, "_unpickle"); _unpickle = PyObject_GetAttrString(m, "_unpickle");
if (_unpickle == NULL) if (_unpickle == NULL)
...@@ -5270,12 +5270,12 @@ PyInit__ctypes(void) ...@@ -5270,12 +5270,12 @@ PyInit__ctypes(void)
if (PyType_Ready(&PyCArg_Type) < 0) if (PyType_Ready(&PyCArg_Type) < 0)
return NULL; return NULL;
if (PyType_Ready(&CThunk_Type) < 0) if (PyType_Ready(&PyCThunk_Type) < 0)
return NULL; return NULL;
/* StgDict is derived from PyDict_Type */ /* StgDict is derived from PyDict_Type */
StgDict_Type.tp_base = &PyDict_Type; PyCStgDict_Type.tp_base = &PyDict_Type;
if (PyType_Ready(&StgDict_Type) < 0) if (PyType_Ready(&PyCStgDict_Type) < 0)
return NULL; return NULL;
/************************************************* /*************************************************
...@@ -5283,28 +5283,28 @@ PyInit__ctypes(void) ...@@ -5283,28 +5283,28 @@ PyInit__ctypes(void)
* Metaclasses * Metaclasses
*/ */
StructType_Type.tp_base = &PyType_Type; PyCStructType_Type.tp_base = &PyType_Type;
if (PyType_Ready(&StructType_Type) < 0) if (PyType_Ready(&PyCStructType_Type) < 0)
return NULL; return NULL;
UnionType_Type.tp_base = &PyType_Type; UnionType_Type.tp_base = &PyType_Type;
if (PyType_Ready(&UnionType_Type) < 0) if (PyType_Ready(&UnionType_Type) < 0)
return NULL; return NULL;
PointerType_Type.tp_base = &PyType_Type; PyCPointerType_Type.tp_base = &PyType_Type;
if (PyType_Ready(&PointerType_Type) < 0) if (PyType_Ready(&PyCPointerType_Type) < 0)
return NULL; return NULL;
ArrayType_Type.tp_base = &PyType_Type; PyCArrayType_Type.tp_base = &PyType_Type;
if (PyType_Ready(&ArrayType_Type) < 0) if (PyType_Ready(&PyCArrayType_Type) < 0)
return NULL; return NULL;
SimpleType_Type.tp_base = &PyType_Type; PyCSimpleType_Type.tp_base = &PyType_Type;
if (PyType_Ready(&SimpleType_Type) < 0) if (PyType_Ready(&PyCSimpleType_Type) < 0)
return NULL; return NULL;
CFuncPtrType_Type.tp_base = &PyType_Type; PyCFuncPtrType_Type.tp_base = &PyType_Type;
if (PyType_Ready(&CFuncPtrType_Type) < 0) if (PyType_Ready(&PyCFuncPtrType_Type) < 0)
return NULL; return NULL;
/************************************************* /*************************************************
...@@ -5312,52 +5312,52 @@ PyInit__ctypes(void) ...@@ -5312,52 +5312,52 @@ PyInit__ctypes(void)
* Classes using a custom metaclass * Classes using a custom metaclass
*/ */
if (PyType_Ready(&CData_Type) < 0) if (PyType_Ready(&PyCData_Type) < 0)
return NULL; return NULL;
Py_TYPE(&Struct_Type) = &StructType_Type; Py_TYPE(&Struct_Type) = &PyCStructType_Type;
Struct_Type.tp_base = &CData_Type; Struct_Type.tp_base = &PyCData_Type;
if (PyType_Ready(&Struct_Type) < 0) if (PyType_Ready(&Struct_Type) < 0)
return NULL; return NULL;
PyModule_AddObject(m, "Structure", (PyObject *)&Struct_Type); PyModule_AddObject(m, "Structure", (PyObject *)&Struct_Type);
Py_TYPE(&Union_Type) = &UnionType_Type; Py_TYPE(&Union_Type) = &UnionType_Type;
Union_Type.tp_base = &CData_Type; Union_Type.tp_base = &PyCData_Type;
if (PyType_Ready(&Union_Type) < 0) if (PyType_Ready(&Union_Type) < 0)
return NULL; return NULL;
PyModule_AddObject(m, "Union", (PyObject *)&Union_Type); PyModule_AddObject(m, "Union", (PyObject *)&Union_Type);
Py_TYPE(&Pointer_Type) = &PointerType_Type; Py_TYPE(&PyCPointer_Type) = &PyCPointerType_Type;
Pointer_Type.tp_base = &CData_Type; PyCPointer_Type.tp_base = &PyCData_Type;
if (PyType_Ready(&Pointer_Type) < 0) if (PyType_Ready(&PyCPointer_Type) < 0)
return NULL; return NULL;
PyModule_AddObject(m, "_Pointer", (PyObject *)&Pointer_Type); PyModule_AddObject(m, "_Pointer", (PyObject *)&PyCPointer_Type);
Py_TYPE(&Array_Type) = &ArrayType_Type; Py_TYPE(&PyCArray_Type) = &PyCArrayType_Type;
Array_Type.tp_base = &CData_Type; PyCArray_Type.tp_base = &PyCData_Type;
if (PyType_Ready(&Array_Type) < 0) if (PyType_Ready(&PyCArray_Type) < 0)
return NULL; return NULL;
PyModule_AddObject(m, "Array", (PyObject *)&Array_Type); PyModule_AddObject(m, "Array", (PyObject *)&PyCArray_Type);
Py_TYPE(&Simple_Type) = &SimpleType_Type; Py_TYPE(&Simple_Type) = &PyCSimpleType_Type;
Simple_Type.tp_base = &CData_Type; Simple_Type.tp_base = &PyCData_Type;
if (PyType_Ready(&Simple_Type) < 0) if (PyType_Ready(&Simple_Type) < 0)
return NULL; return NULL;
PyModule_AddObject(m, "_SimpleCData", (PyObject *)&Simple_Type); PyModule_AddObject(m, "_SimpleCData", (PyObject *)&Simple_Type);
Py_TYPE(&CFuncPtr_Type) = &CFuncPtrType_Type; Py_TYPE(&PyCFuncPtr_Type) = &PyCFuncPtrType_Type;
CFuncPtr_Type.tp_base = &CData_Type; PyCFuncPtr_Type.tp_base = &PyCData_Type;
if (PyType_Ready(&CFuncPtr_Type) < 0) if (PyType_Ready(&PyCFuncPtr_Type) < 0)
return NULL; return NULL;
PyModule_AddObject(m, "CFuncPtr", (PyObject *)&CFuncPtr_Type); PyModule_AddObject(m, "CFuncPtr", (PyObject *)&PyCFuncPtr_Type);
/************************************************* /*************************************************
* *
* Simple classes * Simple classes
*/ */
/* CField_Type is derived from PyBaseObject_Type */ /* PyCField_Type is derived from PyBaseObject_Type */
if (PyType_Ready(&CField_Type) < 0) if (PyType_Ready(&PyCField_Type) < 0)
return NULL; return NULL;
/************************************************* /*************************************************
......
Modules/_ctypes/callbacks.c
View file @ 34596a90
...@@ -17,7 +17,7 @@ CThunkObject_dealloc(PyObject *_self) ...@@ -17,7 +17,7 @@ CThunkObject_dealloc(PyObject *_self)
Py_XDECREF(self->callable); Py_XDECREF(self->callable);
Py_XDECREF(self->restype); Py_XDECREF(self->restype);
if (self->pcl) if (self->pcl)
FreeClosure(self->pcl); _ctypes_free_closure(self->pcl);
PyObject_Del(self); PyObject_Del(self);
} }
...@@ -41,7 +41,7 @@ CThunkObject_clear(PyObject *_self) ...@@ -41,7 +41,7 @@ CThunkObject_clear(PyObject *_self)
return 0; return 0;
} }
PyTypeObject CThunk_Type = { PyTypeObject PyCThunk_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.CThunkObject", "_ctypes.CThunkObject",
sizeof(CThunkObject), /* tp_basicsize */ sizeof(CThunkObject), /* tp_basicsize */
...@@ -92,7 +92,7 @@ PrintError(char *msg, ...) ...@@ -92,7 +92,7 @@ PrintError(char *msg, ...)
/* after code that pyrex generates */ /* after code that pyrex generates */
void _AddTraceback(char *funcname, char *filename, int lineno) void _ctypes_add_traceback(char *funcname, char *filename, int lineno)
{ {
PyObject *py_srcfile = 0; PyObject *py_srcfile = 0;
PyObject *py_funcname = 0; PyObject *py_funcname = 0;
...@@ -223,7 +223,7 @@ static void _CallPythonObject(void *mem, ...@@ -223,7 +223,7 @@ static void _CallPythonObject(void *mem,
goto Done; goto Done;
} }
if (dict && dict->getfunc && !IsSimpleSubType(cnv)) { if (dict && dict->getfunc && !_ctypes_simple_instance(cnv)) {
PyObject *v = dict->getfunc(*pArgs, dict->size); PyObject *v = dict->getfunc(*pArgs, dict->size);
if (!v) { if (!v) {
PrintError("create argument %d:\n", i); PrintError("create argument %d:\n", i);
...@@ -237,7 +237,7 @@ static void _CallPythonObject(void *mem, ...@@ -237,7 +237,7 @@ static void _CallPythonObject(void *mem,
BTW, the same problem occurrs when they are pushed as parameters BTW, the same problem occurrs when they are pushed as parameters
*/ */
} else if (dict) { } else if (dict) {
/* Hm, shouldn't we use CData_AtAddress() or something like that instead? */ /* Hm, shouldn't we use PyCData_AtAddress() or something like that instead? */
CDataObject *obj = (CDataObject *)PyObject_CallFunctionObjArgs(cnv, NULL); CDataObject *obj = (CDataObject *)PyObject_CallFunctionObjArgs(cnv, NULL);
if (!obj) { if (!obj) {
PrintError("create argument %d:\n", i); PrintError("create argument %d:\n", i);
...@@ -268,10 +268,10 @@ static void _CallPythonObject(void *mem, ...@@ -268,10 +268,10 @@ static void _CallPythonObject(void *mem,
} }
#define CHECK(what, x) \ #define CHECK(what, x) \
if (x == NULL) _AddTraceback(what, "_ctypes/callbacks.c", __LINE__ - 1), PyErr_Print() if (x == NULL) _ctypes_add_traceback(what, "_ctypes/callbacks.c", __LINE__ - 1), PyErr_Print()
if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) { if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) {
error_object = get_error_object(&space); error_object = _ctypes_get_errobj(&space);
if (error_object == NULL) if (error_object == NULL)
goto Done; goto Done;
if (flags & FUNCFLAG_USE_ERRNO) { if (flags & FUNCFLAG_USE_ERRNO) {
...@@ -328,7 +328,7 @@ if (x == NULL) _AddTraceback(what, "_ctypes/callbacks.c", __LINE__ - 1), PyErr_P ...@@ -328,7 +328,7 @@ if (x == NULL) _AddTraceback(what, "_ctypes/callbacks.c", __LINE__ - 1), PyErr_P
PyErr_WriteUnraisable(callable); PyErr_WriteUnraisable(callable);
else if (keep == Py_None) /* Nothing to keep */ else if (keep == Py_None) /* Nothing to keep */
Py_DECREF(keep); Py_DECREF(keep);
else if (setfunc != getentry("O")->setfunc) { else if (setfunc != _ctypes_get_fielddesc("O")->setfunc) {
if (-1 == PyErr_WarnEx(PyExc_RuntimeWarning, if (-1 == PyErr_WarnEx(PyExc_RuntimeWarning,
"memory leak in callback function.", "memory leak in callback function.",
1)) 1))
...@@ -364,7 +364,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs) ...@@ -364,7 +364,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
CThunkObject *p; CThunkObject *p;
int i; int i;
p = PyObject_NewVar(CThunkObject, &CThunk_Type, nArgs); p = PyObject_NewVar(CThunkObject, &PyCThunk_Type, nArgs);
if (p == NULL) { if (p == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
...@@ -382,7 +382,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs) ...@@ -382,7 +382,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
return p; return p;
} }
CThunkObject *AllocFunctionCallback(PyObject *callable, CThunkObject *_ctypes_alloc_callback(PyObject *callable,
PyObject *converters, PyObject *converters,
PyObject *restype, PyObject *restype,
int flags) int flags)
...@@ -399,7 +399,7 @@ CThunkObject *AllocFunctionCallback(PyObject *callable, ...@@ -399,7 +399,7 @@ CThunkObject *AllocFunctionCallback(PyObject *callable,
assert(CThunk_CheckExact((PyObject *)p)); assert(CThunk_CheckExact((PyObject *)p));
p->pcl = MallocClosure(); p->pcl = _ctypes_alloc_closure();
if (p->pcl == NULL) { if (p->pcl == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
goto error; goto error;
...@@ -410,7 +410,7 @@ CThunkObject *AllocFunctionCallback(PyObject *callable, ...@@ -410,7 +410,7 @@ CThunkObject *AllocFunctionCallback(PyObject *callable,
PyObject *cnv = PySequence_GetItem(converters, i); PyObject *cnv = PySequence_GetItem(converters, i);
if (cnv == NULL) if (cnv == NULL)
goto error; goto error;
p->atypes[i] = GetType(cnv); p->atypes[i] = _ctypes_get_ffi_type(cnv);
Py_DECREF(cnv); Py_DECREF(cnv);
} }
p->atypes[i] = NULL; p->atypes[i] = NULL;
...@@ -438,7 +438,7 @@ CThunkObject *AllocFunctionCallback(PyObject *callable, ...@@ -438,7 +438,7 @@ CThunkObject *AllocFunctionCallback(PyObject *callable,
#endif #endif
result = ffi_prep_cif(&p->cif, cc, result = ffi_prep_cif(&p->cif, cc,
Py_SAFE_DOWNCAST(nArgs, Py_ssize_t, int), Py_SAFE_DOWNCAST(nArgs, Py_ssize_t, int),
GetType(restype), _ctypes_get_ffi_type(restype),
&p->atypes[0]); &p->atypes[0]);
if (result != FFI_OK) { if (result != FFI_OK) {
PyErr_Format(PyExc_RuntimeError, PyErr_Format(PyExc_RuntimeError,
......
Modules/_ctypes/callproc.c
View file @ 34596a90
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
/* /*
How are functions called, and how are parameters converted to C ? How are functions called, and how are parameters converted to C ?
1. _ctypes.c::CFuncPtr_call receives an argument tuple 'inargs' and a 1. _ctypes.c::PyCFuncPtr_call receives an argument tuple 'inargs' and a
keyword dictionary 'kwds'. keyword dictionary 'kwds'.
2. After several checks, _build_callargs() is called which returns another 2. After several checks, _build_callargs() is called which returns another
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
the callargs tuple, specifying how to build the return value(s) of the callargs tuple, specifying how to build the return value(s) of
the function. the function.
4. _CallProc is then called with the 'callargs' tuple. _CallProc first 4. _ctypes_callproc is then called with the 'callargs' tuple. _ctypes_callproc first
allocates two arrays. The first is an array of 'struct argument' items, the allocates two arrays. The first is an array of 'struct argument' items, the
second array has 'void *' entried. second array has 'void *' entried.
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
libffi specific stuff, then it calls ffi_call. libffi specific stuff, then it calls ffi_call.
So, there are 4 data structures holding processed arguments: So, there are 4 data structures holding processed arguments:
- the inargs tuple (in CFuncPtr_call) - the inargs tuple (in PyCFuncPtr_call)
- the callargs tuple (in CFuncPtr_call) - the callargs tuple (in PyCFuncPtr_call)
- the 'struct argguments' array - the 'struct argguments' array
- the 'void *' array - the 'void *' array
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
kept alive in the thread state dictionary as long as the thread itself. kept alive in the thread state dictionary as long as the thread itself.
*/ */
PyObject * PyObject *
get_error_object(int **pspace) _ctypes_get_errobj(int **pspace)
{ {
PyObject *dict = PyThreadState_GetDict(); PyObject *dict = PyThreadState_GetDict();
PyObject *errobj; PyObject *errobj;
...@@ -153,7 +153,7 @@ static PyObject * ...@@ -153,7 +153,7 @@ static PyObject *
get_error_internal(PyObject *self, PyObject *args, int index) get_error_internal(PyObject *self, PyObject *args, int index)
{ {
int *space; int *space;
PyObject *errobj = get_error_object(&space); PyObject *errobj = _ctypes_get_errobj(&space);
PyObject *result; PyObject *result;
if (errobj == NULL) if (errobj == NULL)
...@@ -172,7 +172,7 @@ set_error_internal(PyObject *self, PyObject *args, int index) ...@@ -172,7 +172,7 @@ set_error_internal(PyObject *self, PyObject *args, int index)
if (!PyArg_ParseTuple(args, "i", &new_errno)) if (!PyArg_ParseTuple(args, "i", &new_errno))
return NULL; return NULL;
errobj = get_error_object(&space); errobj = _ctypes_get_errobj(&space);
if (errobj == NULL) if (errobj == NULL)
return NULL; return NULL;
old_errno = space[index]; old_errno = space[index];
...@@ -405,7 +405,7 @@ check_hresult(PyObject *self, PyObject *args) ...@@ -405,7 +405,7 @@ check_hresult(PyObject *self, PyObject *args)
/**************************************************************/ /**************************************************************/
PyCArgObject * PyCArgObject *
new_CArgObject(void) PyCArgObject_new(void)
{ {
PyCArgObject *p; PyCArgObject *p;
p = PyObject_New(PyCArgObject, &PyCArg_Type); p = PyObject_New(PyCArgObject, &PyCArg_Type);
...@@ -697,7 +697,7 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa) ...@@ -697,7 +697,7 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa)
} }
ffi_type *GetType(PyObject *obj) ffi_type *_ctypes_get_ffi_type(PyObject *obj)
{ {
StgDictObject *dict; StgDictObject *dict;
if (obj == NULL) if (obj == NULL)
...@@ -777,7 +777,7 @@ static int _call_function_pointer(int flags, ...@@ -777,7 +777,7 @@ static int _call_function_pointer(int flags,
} }
if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) { if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) {
error_object = get_error_object(&space); error_object = _ctypes_get_errobj(&space);
if (error_object == NULL) if (error_object == NULL)
return -1; return -1;
} }
...@@ -895,24 +895,24 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker) ...@@ -895,24 +895,24 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker)
if (dict == NULL) if (dict == NULL)
return PyObject_CallFunction(restype, "i", *(int *)result); return PyObject_CallFunction(restype, "i", *(int *)result);
if (dict->getfunc && !IsSimpleSubType(restype)) { if (dict->getfunc && !_ctypes_simple_instance(restype)) {
retval = dict->getfunc(result, dict->size); retval = dict->getfunc(result, dict->size);
/* If restype is py_object (detected by comparing getfunc with /* If restype is py_object (detected by comparing getfunc with
O_get), we have to call Py_DECREF because O_get has already O_get), we have to call Py_DECREF because O_get has already
called Py_INCREF. called Py_INCREF.
*/ */
if (dict->getfunc == getentry("O")->getfunc) { if (dict->getfunc == _ctypes_get_fielddesc("O")->getfunc) {
Py_DECREF(retval); Py_DECREF(retval);
} }
} else } else
retval = CData_FromBaseObj(restype, NULL, 0, result); retval = PyCData_FromBaseObj(restype, NULL, 0, result);
if (!checker || !retval) if (!checker || !retval)
return retval; return retval;
v = PyObject_CallFunctionObjArgs(checker, retval, NULL); v = PyObject_CallFunctionObjArgs(checker, retval, NULL);
if (v == NULL) if (v == NULL)
_AddTraceback("GetResult", "_ctypes/callproc.c", __LINE__-2); _ctypes_add_traceback("GetResult", "_ctypes/callproc.c", __LINE__-2);
Py_DECREF(retval); Py_DECREF(retval);
return v; return v;
} }
...@@ -921,7 +921,7 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker) ...@@ -921,7 +921,7 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker)
* Raise a new exception 'exc_class', adding additional text to the original * Raise a new exception 'exc_class', adding additional text to the original
* exception string. * exception string.
*/ */
void Extend_Error_Info(PyObject *exc_class, char *fmt, ...) void _ctypes_extend_error(PyObject *exc_class, char *fmt, ...)
{ {
va_list vargs; va_list vargs;
PyObject *tp, *v, *tb, *s, *cls_str, *msg_str; PyObject *tp, *v, *tb, *s, *cls_str, *msg_str;
...@@ -1042,7 +1042,7 @@ GetComError(HRESULT errcode, GUID *riid, IUnknown *pIunk) ...@@ -1042,7 +1042,7 @@ GetComError(HRESULT errcode, GUID *riid, IUnknown *pIunk)
* *
* - XXX various requirements for restype, not yet collected * - XXX various requirements for restype, not yet collected
*/ */
PyObject *_CallProc(PPROC pProc, PyObject *_ctypes_callproc(PPROC pProc,
PyObject *argtuple, PyObject *argtuple,
#ifdef MS_WIN32 #ifdef MS_WIN32
IUnknown *pIunk, IUnknown *pIunk,
...@@ -1095,7 +1095,7 @@ PyObject *_CallProc(PPROC pProc, ...@@ -1095,7 +1095,7 @@ PyObject *_CallProc(PPROC pProc,
arg = PyTuple_GET_ITEM(argtuple, i); /* borrowed ref */ arg = PyTuple_GET_ITEM(argtuple, i); /* borrowed ref */
/* For cdecl functions, we allow more actual arguments /* For cdecl functions, we allow more actual arguments
than the length of the argtypes tuple. than the length of the argtypes tuple.
This is checked in _ctypes::CFuncPtr_Call This is checked in _ctypes::PyCFuncPtr_Call
*/ */
if (argtypes && argtype_count > i) { if (argtypes && argtype_count > i) {
PyObject *v; PyObject *v;
...@@ -1104,26 +1104,26 @@ PyObject *_CallProc(PPROC pProc, ...@@ -1104,26 +1104,26 @@ PyObject *_CallProc(PPROC pProc,
arg, arg,
NULL); NULL);
if (v == NULL) { if (v == NULL) {
Extend_Error_Info(PyExc_ArgError, "argument %d: ", i+1); _ctypes_extend_error(PyExc_ArgError, "argument %d: ", i+1);
goto cleanup; goto cleanup;
} }
err = ConvParam(v, i+1, pa); err = ConvParam(v, i+1, pa);
Py_DECREF(v); Py_DECREF(v);
if (-1 == err) { if (-1 == err) {
Extend_Error_Info(PyExc_ArgError, "argument %d: ", i+1); _ctypes_extend_error(PyExc_ArgError, "argument %d: ", i+1);
goto cleanup; goto cleanup;
} }
} else { } else {
err = ConvParam(arg, i+1, pa); err = ConvParam(arg, i+1, pa);
if (-1 == err) { if (-1 == err) {
Extend_Error_Info(PyExc_ArgError, "argument %d: ", i+1); _ctypes_extend_error(PyExc_ArgError, "argument %d: ", i+1);
goto cleanup; /* leaking ? */ goto cleanup; /* leaking ? */
} }
} }
} }
rtype = GetType(restype); rtype = _ctypes_get_ffi_type(restype);
resbuf = alloca(max(rtype->size, sizeof(ffi_arg))); resbuf = alloca(max(rtype->size, sizeof(ffi_arg)));
avalues = (void **)alloca(sizeof(void *) * argcount); avalues = (void **)alloca(sizeof(void *) * argcount);
...@@ -1310,7 +1310,7 @@ call_commethod(PyObject *self, PyObject *args) ...@@ -1310,7 +1310,7 @@ call_commethod(PyObject *self, PyObject *args)
pIunk = (IUnknown *)(*(void **)(pcom->b_ptr)); pIunk = (IUnknown *)(*(void **)(pcom->b_ptr));
lpVtbl = (PPROC *)(pIunk->lpVtbl); lpVtbl = (PPROC *)(pIunk->lpVtbl);
result = _CallProc(lpVtbl[index], result = _ctypes_callproc(lpVtbl[index],
arguments, arguments,
#ifdef MS_WIN32 #ifdef MS_WIN32
pIunk, pIunk,
...@@ -1433,7 +1433,7 @@ call_function(PyObject *self, PyObject *args) ...@@ -1433,7 +1433,7 @@ call_function(PyObject *self, PyObject *args)
&PyTuple_Type, &arguments)) &PyTuple_Type, &arguments))
return NULL; return NULL;
result = _CallProc((PPROC)func, result = _ctypes_callproc((PPROC)func,
arguments, arguments,
#ifdef MS_WIN32 #ifdef MS_WIN32
NULL, NULL,
...@@ -1464,7 +1464,7 @@ call_cdeclfunction(PyObject *self, PyObject *args) ...@@ -1464,7 +1464,7 @@ call_cdeclfunction(PyObject *self, PyObject *args)
&PyTuple_Type, &arguments)) &PyTuple_Type, &arguments))
return NULL; return NULL;
result = _CallProc((PPROC)func, result = _ctypes_callproc((PPROC)func,
arguments, arguments,
#ifdef MS_WIN32 #ifdef MS_WIN32
NULL, NULL,
...@@ -1556,7 +1556,7 @@ byref(PyObject *self, PyObject *args) ...@@ -1556,7 +1556,7 @@ byref(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
parg = new_CArgObject(); parg = PyCArgObject_new();
if (parg == NULL) if (parg == NULL)
return NULL; return NULL;
...@@ -1631,17 +1631,17 @@ set_conversion_mode(PyObject *self, PyObject *args) ...@@ -1631,17 +1631,17 @@ set_conversion_mode(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "zs:set_conversion_mode", &coding, &mode)) if (!PyArg_ParseTuple(args, "zs:set_conversion_mode", &coding, &mode))
return NULL; return NULL;
result = Py_BuildValue("(zz)", conversion_mode_encoding, conversion_mode_errors); result = Py_BuildValue("(zz)", _ctypes_conversion_encoding, _ctypes_conversion_errors);
if (coding) { if (coding) {
PyMem_Free(conversion_mode_encoding); PyMem_Free(_ctypes_conversion_encoding);
conversion_mode_encoding = PyMem_Malloc(strlen(coding) + 1); _ctypes_conversion_encoding = PyMem_Malloc(strlen(coding) + 1);
strcpy(conversion_mode_encoding, coding); strcpy(_ctypes_conversion_encoding, coding);
} else { } else {
conversion_mode_encoding = NULL; _ctypes_conversion_encoding = NULL;
} }
PyMem_Free(conversion_mode_errors); PyMem_Free(_ctypes_conversion_errors);
conversion_mode_errors = PyMem_Malloc(strlen(mode) + 1); _ctypes_conversion_errors = PyMem_Malloc(strlen(mode) + 1);
strcpy(conversion_mode_errors, mode); strcpy(_ctypes_conversion_errors, mode);
return result; return result;
} }
#endif #endif
...@@ -1732,7 +1732,7 @@ POINTER(PyObject *self, PyObject *cls) ...@@ -1732,7 +1732,7 @@ POINTER(PyObject *self, PyObject *cls)
PyObject *key; PyObject *key;
char *buf; char *buf;
result = PyDict_GetItem(_pointer_type_cache, cls); result = PyDict_GetItem(_ctypes_ptrtype_cache, cls);
if (result) { if (result) {
Py_INCREF(result); Py_INCREF(result);
return result; return result;
...@@ -1741,10 +1741,10 @@ POINTER(PyObject *self, PyObject *cls) ...@@ -1741,10 +1741,10 @@ POINTER(PyObject *self, PyObject *cls)
char *name = _PyUnicode_AsString(cls); char *name = _PyUnicode_AsString(cls);
buf = alloca(strlen(name) + 3 + 1); buf = alloca(strlen(name) + 3 + 1);
sprintf(buf, "LP_%s", name); sprintf(buf, "LP_%s", name);
result = PyObject_CallFunction((PyObject *)Py_TYPE(&Pointer_Type), result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type),
"s(O){}", "s(O){}",
buf, buf,
&Pointer_Type); &PyCPointer_Type);
if (result == NULL) if (result == NULL)
return result; return result;
key = PyLong_FromVoidPtr(result); key = PyLong_FromVoidPtr(result);
...@@ -1752,10 +1752,10 @@ POINTER(PyObject *self, PyObject *cls) ...@@ -1752,10 +1752,10 @@ POINTER(PyObject *self, PyObject *cls)
typ = (PyTypeObject *)cls; typ = (PyTypeObject *)cls;
buf = alloca(strlen(typ->tp_name) + 3 + 1); buf = alloca(strlen(typ->tp_name) + 3 + 1);
sprintf(buf, "LP_%s", typ->tp_name); sprintf(buf, "LP_%s", typ->tp_name);
result = PyObject_CallFunction((PyObject *)Py_TYPE(&Pointer_Type), result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type),
"s(O){sO}", "s(O){sO}",
buf, buf,
&Pointer_Type, &PyCPointer_Type,
"_type_", cls); "_type_", cls);
if (result == NULL) if (result == NULL)
return result; return result;
...@@ -1765,7 +1765,7 @@ POINTER(PyObject *self, PyObject *cls) ...@@ -1765,7 +1765,7 @@ POINTER(PyObject *self, PyObject *cls)
PyErr_SetString(PyExc_TypeError, "must be a ctypes type"); PyErr_SetString(PyExc_TypeError, "must be a ctypes type");
return NULL; return NULL;
} }
if (-1 == PyDict_SetItem(_pointer_type_cache, key, result)) { if (-1 == PyDict_SetItem(_ctypes_ptrtype_cache, key, result)) {
Py_DECREF(result); Py_DECREF(result);
Py_DECREF(key); Py_DECREF(key);
return NULL; return NULL;
...@@ -1780,7 +1780,7 @@ pointer(PyObject *self, PyObject *arg) ...@@ -1780,7 +1780,7 @@ pointer(PyObject *self, PyObject *arg)
PyObject *result; PyObject *result;
PyObject *typ; PyObject *typ;
typ = PyDict_GetItem(_pointer_type_cache, (PyObject *)Py_TYPE(arg)); typ = PyDict_GetItem(_ctypes_ptrtype_cache, (PyObject *)Py_TYPE(arg));
if (typ) if (typ)
return PyObject_CallFunctionObjArgs(typ, arg, NULL); return PyObject_CallFunctionObjArgs(typ, arg, NULL);
typ = POINTER(NULL, (PyObject *)Py_TYPE(arg)); typ = POINTER(NULL, (PyObject *)Py_TYPE(arg));
...@@ -1818,7 +1818,7 @@ buffer_info(PyObject *self, PyObject *arg) ...@@ -1818,7 +1818,7 @@ buffer_info(PyObject *self, PyObject *arg)
return Py_BuildValue("siN", dict->format, dict->ndim, shape); return Py_BuildValue("siN", dict->format, dict->ndim, shape);
} }
PyMethodDef module_methods[] = { PyMethodDef _ctypes_module_methods[] = {
{"get_errno", get_errno, METH_NOARGS}, {"get_errno", get_errno, METH_NOARGS},
{"set_errno", set_errno, METH_VARARGS}, {"set_errno", set_errno, METH_VARARGS},
{"POINTER", POINTER, METH_O }, {"POINTER", POINTER, METH_O },
......
Modules/_ctypes/cfield.c
View file @ 34596a90
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
/******************************************************************/ /******************************************************************/
/* /*
CField_Type PyCField_Type
*/ */
static PyObject * static PyObject *
CField_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyCField_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
CFieldObject *obj; CFieldObject *obj;
obj = (CFieldObject *)type->tp_alloc(type, 0); obj = (CFieldObject *)type->tp_alloc(type, 0);
...@@ -31,7 +31,7 @@ CField_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -31,7 +31,7 @@ CField_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
* prev_desc points to the type of the previous bitfield, if any. * prev_desc points to the type of the previous bitfield, if any.
*/ */
PyObject * PyObject *
CField_FromDesc(PyObject *desc, Py_ssize_t index, PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
Py_ssize_t *pfield_size, int bitsize, int *pbitofs, Py_ssize_t *pfield_size, int bitsize, int *pbitofs,
Py_ssize_t *psize, Py_ssize_t *poffset, Py_ssize_t *palign, Py_ssize_t *psize, Py_ssize_t *poffset, Py_ssize_t *palign,
int pack, int big_endian) int pack, int big_endian)
...@@ -48,7 +48,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index, ...@@ -48,7 +48,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index,
#define CONT_BITFIELD 2 #define CONT_BITFIELD 2
#define EXPAND_BITFIELD 3 #define EXPAND_BITFIELD 3
self = (CFieldObject *)PyObject_CallObject((PyObject *)&CField_Type, self = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type,
NULL); NULL);
if (self == NULL) if (self == NULL)
return NULL; return NULL;
...@@ -98,7 +98,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index, ...@@ -98,7 +98,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index,
/* Field descriptors for 'c_char * n' are be scpecial cased to /* Field descriptors for 'c_char * n' are be scpecial cased to
return a Python string instead of an Array object instance... return a Python string instead of an Array object instance...
*/ */
if (ArrayTypeObject_Check(proto)) { if (PyCArrayTypeObject_Check(proto)) {
StgDictObject *adict = PyType_stgdict(proto); StgDictObject *adict = PyType_stgdict(proto);
StgDictObject *idict; StgDictObject *idict;
if (adict && adict->proto) { if (adict && adict->proto) {
...@@ -109,14 +109,14 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index, ...@@ -109,14 +109,14 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index,
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
} }
if (idict->getfunc == getentry("c")->getfunc) { if (idict->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
struct fielddesc *fd = getentry("s"); struct fielddesc *fd = _ctypes_get_fielddesc("s");
getfunc = fd->getfunc; getfunc = fd->getfunc;
setfunc = fd->setfunc; setfunc = fd->setfunc;
} }
#ifdef CTYPES_UNICODE #ifdef CTYPES_UNICODE
if (idict->getfunc == getentry("u")->getfunc) { if (idict->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
struct fielddesc *fd = getentry("U"); struct fielddesc *fd = _ctypes_get_fielddesc("U");
getfunc = fd->getfunc; getfunc = fd->getfunc;
setfunc = fd->setfunc; setfunc = fd->setfunc;
} }
...@@ -190,7 +190,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index, ...@@ -190,7 +190,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index,
} }
static int static int
CField_set(CFieldObject *self, PyObject *inst, PyObject *value) PyCField_set(CFieldObject *self, PyObject *inst, PyObject *value)
{ {
CDataObject *dst; CDataObject *dst;
char *ptr; char *ptr;
...@@ -202,12 +202,12 @@ CField_set(CFieldObject *self, PyObject *inst, PyObject *value) ...@@ -202,12 +202,12 @@ CField_set(CFieldObject *self, PyObject *inst, PyObject *value)
"can't delete attribute"); "can't delete attribute");
return -1; return -1;
} }
return CData_set(inst, self->proto, self->setfunc, value, return PyCData_set(inst, self->proto, self->setfunc, value,
self->index, self->size, ptr); self->index, self->size, ptr);
} }
static PyObject * static PyObject *
CField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type) PyCField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type)
{ {
CDataObject *src; CDataObject *src;
if (inst == NULL) { if (inst == NULL) {
...@@ -216,51 +216,51 @@ CField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type) ...@@ -216,51 +216,51 @@ CField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type)
} }
assert(CDataObject_Check(inst)); assert(CDataObject_Check(inst));
src = (CDataObject *)inst; src = (CDataObject *)inst;
return CData_get(self->proto, self->getfunc, inst, return PyCData_get(self->proto, self->getfunc, inst,
self->index, self->size, src->b_ptr + self->offset); self->index, self->size, src->b_ptr + self->offset);
} }
static PyObject * static PyObject *
CField_get_offset(PyObject *self, void *data) PyCField_get_offset(PyObject *self, void *data)
{ {
return PyLong_FromSsize_t(((CFieldObject *)self)->offset); return PyLong_FromSsize_t(((CFieldObject *)self)->offset);
} }
static PyObject * static PyObject *
CField_get_size(PyObject *self, void *data) PyCField_get_size(PyObject *self, void *data)
{ {
return PyLong_FromSsize_t(((CFieldObject *)self)->size); return PyLong_FromSsize_t(((CFieldObject *)self)->size);
} }
static PyGetSetDef CField_getset[] = { static PyGetSetDef PyCField_getset[] = {
{ "offset", CField_get_offset, NULL, "offset in bytes of this field" }, { "offset", PyCField_get_offset, NULL, "offset in bytes of this field" },
{ "size", CField_get_size, NULL, "size in bytes of this field" }, { "size", PyCField_get_size, NULL, "size in bytes of this field" },
{ NULL, NULL, NULL, NULL }, { NULL, NULL, NULL, NULL },
}; };
static int static int
CField_traverse(CFieldObject *self, visitproc visit, void *arg) PyCField_traverse(CFieldObject *self, visitproc visit, void *arg)
{ {
Py_VISIT(self->proto); Py_VISIT(self->proto);
return 0; return 0;
} }
static int static int
CField_clear(CFieldObject *self) PyCField_clear(CFieldObject *self)
{ {
Py_CLEAR(self->proto); Py_CLEAR(self->proto);
return 0; return 0;
} }
static void static void
CField_dealloc(PyObject *self) PyCField_dealloc(PyObject *self)
{ {
CField_clear((CFieldObject *)self); PyCField_clear((CFieldObject *)self);
self->ob_type->tp_free((PyObject *)self); self->ob_type->tp_free((PyObject *)self);
} }
static PyObject * static PyObject *
CField_repr(CFieldObject *self) PyCField_repr(CFieldObject *self)
{ {
PyObject *result; PyObject *result;
Py_ssize_t bits = self->size >> 16; Py_ssize_t bits = self->size >> 16;
...@@ -280,17 +280,17 @@ CField_repr(CFieldObject *self) ...@@ -280,17 +280,17 @@ CField_repr(CFieldObject *self)
return result; return result;
} }
PyTypeObject CField_Type = { PyTypeObject PyCField_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.CField", /* tp_name */ "_ctypes.CField", /* tp_name */
sizeof(CFieldObject), /* tp_basicsize */ sizeof(CFieldObject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
CField_dealloc, /* tp_dealloc */ PyCField_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_reserved */ 0, /* tp_reserved */
(reprfunc)CField_repr, /* tp_repr */ (reprfunc)PyCField_repr, /* tp_repr */
0, /* tp_as_number */ 0, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
...@@ -302,23 +302,23 @@ PyTypeObject CField_Type = { ...@@ -302,23 +302,23 @@ PyTypeObject CField_Type = {
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
"Structure/Union member", /* tp_doc */ "Structure/Union member", /* tp_doc */
(traverseproc)CField_traverse, /* tp_traverse */ (traverseproc)PyCField_traverse, /* tp_traverse */
(inquiry)CField_clear, /* tp_clear */ (inquiry)PyCField_clear, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
0, /* tp_methods */ 0, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */
CField_getset, /* tp_getset */ PyCField_getset, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
0, /* tp_dict */ 0, /* tp_dict */
(descrgetfunc)CField_get, /* tp_descr_get */ (descrgetfunc)PyCField_get, /* tp_descr_get */
(descrsetfunc)CField_set, /* tp_descr_set */ (descrsetfunc)PyCField_set, /* tp_descr_set */
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
CField_new, /* tp_new */ PyCField_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
...@@ -1158,8 +1158,8 @@ c_set(void *ptr, PyObject *value, Py_ssize_t size) ...@@ -1158,8 +1158,8 @@ c_set(void *ptr, PyObject *value, Py_ssize_t size)
{ {
if (PyUnicode_Check(value)) { if (PyUnicode_Check(value)) {
value = PyUnicode_AsEncodedString(value, value = PyUnicode_AsEncodedString(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (value == NULL) if (value == NULL)
return NULL; return NULL;
if (PyBytes_GET_SIZE(value) != 1) { if (PyBytes_GET_SIZE(value) != 1) {
...@@ -1207,8 +1207,8 @@ u_set(void *ptr, PyObject *value, Py_ssize_t size) ...@@ -1207,8 +1207,8 @@ u_set(void *ptr, PyObject *value, Py_ssize_t size)
Py_ssize_t len; Py_ssize_t len;
if (PyBytes_Check(value)) { if (PyBytes_Check(value)) {
value = PyUnicode_FromEncodedObject(value, value = PyUnicode_FromEncodedObject(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (!value) if (!value)
return NULL; return NULL;
} else if (!PyUnicode_Check(value)) { } else if (!PyUnicode_Check(value)) {
...@@ -1282,8 +1282,8 @@ U_set(void *ptr, PyObject *value, Py_ssize_t length) ...@@ -1282,8 +1282,8 @@ U_set(void *ptr, PyObject *value, Py_ssize_t length)
if (PyBytes_Check(value)) { if (PyBytes_Check(value)) {
value = PyUnicode_FromEncodedObject(value, value = PyUnicode_FromEncodedObject(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (!value) if (!value)
return NULL; return NULL;
} else if (!PyUnicode_Check(value)) { } else if (!PyUnicode_Check(value)) {
...@@ -1332,8 +1332,8 @@ s_set(void *ptr, PyObject *value, Py_ssize_t length) ...@@ -1332,8 +1332,8 @@ s_set(void *ptr, PyObject *value, Py_ssize_t length)
if (PyUnicode_Check(value)) { if (PyUnicode_Check(value)) {
value = PyUnicode_AsEncodedString(value, value = PyUnicode_AsEncodedString(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (value == NULL) if (value == NULL)
return NULL; return NULL;
assert(PyBytes_Check(value)); assert(PyBytes_Check(value));
...@@ -1383,8 +1383,8 @@ z_set(void *ptr, PyObject *value, Py_ssize_t size) ...@@ -1383,8 +1383,8 @@ z_set(void *ptr, PyObject *value, Py_ssize_t size)
return value; return value;
} else if (PyUnicode_Check(value)) { } else if (PyUnicode_Check(value)) {
PyObject *str = PyUnicode_AsEncodedString(value, PyObject *str = PyUnicode_AsEncodedString(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (str == NULL) if (str == NULL)
return NULL; return NULL;
*(char **)ptr = PyBytes_AS_STRING(str); *(char **)ptr = PyBytes_AS_STRING(str);
...@@ -1443,8 +1443,8 @@ Z_set(void *ptr, PyObject *value, Py_ssize_t size) ...@@ -1443,8 +1443,8 @@ Z_set(void *ptr, PyObject *value, Py_ssize_t size)
} }
if (PyBytes_Check(value)) { if (PyBytes_Check(value)) {
value = PyUnicode_FromEncodedObject(value, value = PyUnicode_FromEncodedObject(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (!value) if (!value)
return NULL; return NULL;
} else if (!PyUnicode_Check(value)) { } else if (!PyUnicode_Check(value)) {
...@@ -1529,8 +1529,8 @@ BSTR_set(void *ptr, PyObject *value, Py_ssize_t size) ...@@ -1529,8 +1529,8 @@ BSTR_set(void *ptr, PyObject *value, Py_ssize_t size)
value = NULL; value = NULL;
} else if (PyBytes_Check(value)) { } else if (PyBytes_Check(value)) {
value = PyUnicode_FromEncodedObject(value, value = PyUnicode_FromEncodedObject(value,
conversion_mode_encoding, _ctypes_conversion_encoding,
conversion_mode_errors); _ctypes_conversion_errors);
if (!value) if (!value)
return NULL; return NULL;
} else if (PyUnicode_Check(value)) { } else if (PyUnicode_Check(value)) {
...@@ -1690,7 +1690,7 @@ static struct fielddesc formattable[] = { ...@@ -1690,7 +1690,7 @@ static struct fielddesc formattable[] = {
*/ */
struct fielddesc * struct fielddesc *
getentry(const char *fmt) _ctypes_get_fielddesc(const char *fmt)
{ {
static int initialized = 0; static int initialized = 0;
struct fielddesc *table = formattable; struct fielddesc *table = formattable;
...@@ -1699,11 +1699,11 @@ getentry(const char *fmt) ...@@ -1699,11 +1699,11 @@ getentry(const char *fmt)
initialized = 1; initialized = 1;
#ifdef CTYPES_UNICODE #ifdef CTYPES_UNICODE
if (sizeof(wchar_t) == sizeof(short)) if (sizeof(wchar_t) == sizeof(short))
getentry("u")->pffi_type = &ffi_type_sshort; _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_sshort;
else if (sizeof(wchar_t) == sizeof(int)) else if (sizeof(wchar_t) == sizeof(int))
getentry("u")->pffi_type = &ffi_type_sint; _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_sint;
else if (sizeof(wchar_t) == sizeof(long)) else if (sizeof(wchar_t) == sizeof(long))
getentry("u")->pffi_type = &ffi_type_slong; _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_slong;
#endif #endif
} }
......
Modules/_ctypes/ctypes.h
View file @ 34596a90
...@@ -18,7 +18,7 @@ this buffer is too small, PyMem_Malloc will be called to create a larger one, ...@@ -18,7 +18,7 @@ this buffer is too small, PyMem_Malloc will be called to create a larger one,
and this one is not used. and this one is not used.
Making CDataObject a variable size object would be a better solution, but more Making CDataObject a variable size object would be a better solution, but more
difficult in the presence of CFuncPtrObject. Maybe later. difficult in the presence of PyCFuncPtrObject. Maybe later.
*/ */
union value { union value {
char c[16]; char c[16];
...@@ -64,8 +64,8 @@ typedef struct { ...@@ -64,8 +64,8 @@ typedef struct {
ffi_type *ffi_restype; ffi_type *ffi_restype;
ffi_type *atypes[1]; ffi_type *atypes[1];
} CThunkObject; } CThunkObject;
extern PyTypeObject CThunk_Type; extern PyTypeObject PyCThunk_Type;
#define CThunk_CheckExact(v) ((v)->ob_type == &CThunk_Type) #define CThunk_CheckExact(v) ((v)->ob_type == &PyCThunk_Type)
typedef struct { typedef struct {
/* First part identical to tagCDataObject */ /* First part identical to tagCDataObject */
...@@ -96,61 +96,61 @@ typedef struct { ...@@ -96,61 +96,61 @@ typedef struct {
GUID *iid; GUID *iid;
#endif #endif
PyObject *paramflags; PyObject *paramflags;
} CFuncPtrObject; } PyCFuncPtrObject;
extern PyTypeObject StgDict_Type; extern PyTypeObject PyCStgDict_Type;
#define StgDict_CheckExact(v) ((v)->ob_type == &StgDict_Type) #define PyCStgDict_CheckExact(v) ((v)->ob_type == &PyCStgDict_Type)
#define StgDict_Check(v) PyObject_TypeCheck(v, &StgDict_Type) #define PyCStgDict_Check(v) PyObject_TypeCheck(v, &PyCStgDict_Type)
extern int StructUnionType_update_stgdict(PyObject *fields, PyObject *type, int isStruct); extern int PyCStructUnionType_update_stgdict(PyObject *fields, PyObject *type, int isStruct);
extern int PyType_stginfo(PyTypeObject *self, Py_ssize_t *psize, Py_ssize_t *palign, Py_ssize_t *plength); extern int PyType_stginfo(PyTypeObject *self, Py_ssize_t *psize, Py_ssize_t *palign, Py_ssize_t *plength);
extern int PyObject_stginfo(PyObject *self, Py_ssize_t *psize, Py_ssize_t *palign, Py_ssize_t *plength); extern int PyObject_stginfo(PyObject *self, Py_ssize_t *psize, Py_ssize_t *palign, Py_ssize_t *plength);
extern PyTypeObject CData_Type; extern PyTypeObject PyCData_Type;
#define CDataObject_CheckExact(v) ((v)->ob_type == &CData_Type) #define CDataObject_CheckExact(v) ((v)->ob_type == &PyCData_Type)
#define CDataObject_Check(v) PyObject_TypeCheck(v, &CData_Type) #define CDataObject_Check(v) PyObject_TypeCheck(v, &PyCData_Type)
extern PyTypeObject SimpleType_Type; extern PyTypeObject PyCSimpleType_Type;
#define SimpleTypeObject_CheckExact(v) ((v)->ob_type == &SimpleType_Type) #define PyCSimpleTypeObject_CheckExact(v) ((v)->ob_type == &PyCSimpleType_Type)
#define SimpleTypeObject_Check(v) PyObject_TypeCheck(v, &SimpleType_Type) #define PyCSimpleTypeObject_Check(v) PyObject_TypeCheck(v, &PyCSimpleType_Type)
extern PyTypeObject CField_Type; extern PyTypeObject PyCField_Type;
extern struct fielddesc *getentry(const char *fmt); extern struct fielddesc *_ctypes_get_fielddesc(const char *fmt);
extern PyObject * extern PyObject *
CField_FromDesc(PyObject *desc, Py_ssize_t index, PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
Py_ssize_t *pfield_size, int bitsize, int *pbitofs, Py_ssize_t *pfield_size, int bitsize, int *pbitofs,
Py_ssize_t *psize, Py_ssize_t *poffset, Py_ssize_t *palign, Py_ssize_t *psize, Py_ssize_t *poffset, Py_ssize_t *palign,
int pack, int is_big_endian); int pack, int is_big_endian);
extern PyObject *CData_AtAddress(PyObject *type, void *buf); extern PyObject *PyCData_AtAddress(PyObject *type, void *buf);
extern PyObject *CData_FromBytes(PyObject *type, char *data, Py_ssize_t length); extern PyObject *PyCData_FromBytes(PyObject *type, char *data, Py_ssize_t length);
extern PyTypeObject ArrayType_Type; extern PyTypeObject PyCArrayType_Type;
extern PyTypeObject Array_Type; extern PyTypeObject PyCArray_Type;
extern PyTypeObject PointerType_Type; extern PyTypeObject PyCPointerType_Type;
extern PyTypeObject Pointer_Type; extern PyTypeObject PyCPointer_Type;
extern PyTypeObject CFuncPtr_Type; extern PyTypeObject PyCFuncPtr_Type;
extern PyTypeObject CFuncPtrType_Type; extern PyTypeObject PyCFuncPtrType_Type;
extern PyTypeObject StructType_Type; extern PyTypeObject PyCStructType_Type;
#define ArrayTypeObject_Check(v) PyObject_TypeCheck(v, &ArrayType_Type) #define PyCArrayTypeObject_Check(v) PyObject_TypeCheck(v, &PyCArrayType_Type)
#define ArrayObject_Check(v) PyObject_TypeCheck(v, &Array_Type) #define ArrayObject_Check(v) PyObject_TypeCheck(v, &PyCArray_Type)
#define PointerObject_Check(v) PyObject_TypeCheck(v, &Pointer_Type) #define PointerObject_Check(v) PyObject_TypeCheck(v, &PyCPointer_Type)
#define PointerTypeObject_Check(v) PyObject_TypeCheck(v, &PointerType_Type) #define PyCPointerTypeObject_Check(v) PyObject_TypeCheck(v, &PyCPointerType_Type)
#define CFuncPtrObject_Check(v) PyObject_TypeCheck(v, &CFuncPtr_Type) #define PyCFuncPtrObject_Check(v) PyObject_TypeCheck(v, &PyCFuncPtr_Type)
#define CFuncPtrTypeObject_Check(v) PyObject_TypeCheck(v, &CFuncPtrType_Type) #define PyCFuncPtrTypeObject_Check(v) PyObject_TypeCheck(v, &PyCFuncPtrType_Type)
#define StructTypeObject_Check(v) PyObject_TypeCheck(v, &StructType_Type) #define PyCStructTypeObject_Check(v) PyObject_TypeCheck(v, &PyCStructType_Type)
extern PyObject * extern PyObject *
CreateArrayType(PyObject *itemtype, Py_ssize_t length); PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length);
extern PyMethodDef module_methods[]; extern PyMethodDef _ctypes_module_methods[];
extern CThunkObject *AllocFunctionCallback(PyObject *callable, extern CThunkObject *_ctypes_alloc_callback(PyObject *callable,
PyObject *converters, PyObject *converters,
PyObject *restype, PyObject *restype,
int flags); int flags);
...@@ -182,7 +182,7 @@ typedef struct { ...@@ -182,7 +182,7 @@ typedef struct {
PyDictObject dict; /* first part identical to PyDictObject */ PyDictObject dict; /* first part identical to PyDictObject */
/* The size and align fields are unneeded, they are in ffi_type as well. As /* The size and align fields are unneeded, they are in ffi_type as well. As
an experiment shows, it's trivial to get rid of them, the only thing to an experiment shows, it's trivial to get rid of them, the only thing to
remember is that in ArrayType_new the ffi_type fields must be filled in - remember is that in PyCArrayType_new the ffi_type fields must be filled in -
so far it was unneeded because libffi doesn't support arrays at all so far it was unneeded because libffi doesn't support arrays at all
(because they are passed as pointers to function calls anyway). But it's (because they are passed as pointers to function calls anyway). But it's
too much risk to change that now, and there are other fields which doen't too much risk to change that now, and there are other fields which doen't
...@@ -197,7 +197,7 @@ typedef struct { ...@@ -197,7 +197,7 @@ typedef struct {
GETFUNC getfunc; /* Only for simple objects */ GETFUNC getfunc; /* Only for simple objects */
PARAMFUNC paramfunc; PARAMFUNC paramfunc;
/* Following fields only used by CFuncPtrType_Type instances */ /* Following fields only used by PyCFuncPtrType_Type instances */
PyObject *argtypes; /* tuple of CDataObjects */ PyObject *argtypes; /* tuple of CDataObjects */
PyObject *converters; /* tuple([t.from_param for t in argtypes]) */ PyObject *converters; /* tuple([t.from_param for t in argtypes]) */
PyObject *restype; /* CDataObject or NULL */ PyObject *restype; /* CDataObject or NULL */
...@@ -231,7 +231,7 @@ typedef struct { ...@@ -231,7 +231,7 @@ typedef struct {
construction time, or assigns to it later, tp_setattro should update the construction time, or assigns to it later, tp_setattro should update the
StgDictObject function to a generic one. StgDictObject function to a generic one.
Currently, CFuncPtr types have 'converters' and 'checker' entries in their Currently, PyCFuncPtr types have 'converters' and 'checker' entries in their
type dict. They are only used to cache attributes from other entries, whihc type dict. They are only used to cache attributes from other entries, whihc
is wrong. is wrong.
...@@ -259,11 +259,11 @@ extern StgDictObject *PyType_stgdict(PyObject *obj); ...@@ -259,11 +259,11 @@ extern StgDictObject *PyType_stgdict(PyObject *obj);
/* May return NULL, but does not set an exception! */ /* May return NULL, but does not set an exception! */
extern StgDictObject *PyObject_stgdict(PyObject *self); extern StgDictObject *PyObject_stgdict(PyObject *self);
extern int StgDict_clone(StgDictObject *src, StgDictObject *dst); extern int PyCStgDict_clone(StgDictObject *src, StgDictObject *dst);
typedef int(* PPROC)(void); typedef int(* PPROC)(void);
PyObject *_CallProc(PPROC pProc, PyObject *_ctypes_callproc(PPROC pProc,
PyObject *arguments, PyObject *arguments,
#ifdef MS_WIN32 #ifdef MS_WIN32
IUnknown *pIUnk, IUnknown *pIUnk,
...@@ -311,17 +311,17 @@ struct tagPyCArgObject { ...@@ -311,17 +311,17 @@ struct tagPyCArgObject {
extern PyTypeObject PyCArg_Type; extern PyTypeObject PyCArg_Type;
#define PyCArg_CheckExact(v) ((v)->ob_type == &PyCArg_Type) #define PyCArg_CheckExact(v) ((v)->ob_type == &PyCArg_Type)
extern PyCArgObject *new_CArgObject(void); extern PyCArgObject *PyCArgObject_new(void);
extern PyObject * extern PyObject *
CData_get(PyObject *type, GETFUNC getfunc, PyObject *src, PyCData_get(PyObject *type, GETFUNC getfunc, PyObject *src,
Py_ssize_t index, Py_ssize_t size, char *ptr); Py_ssize_t index, Py_ssize_t size, char *ptr);
extern int extern int
CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, PyCData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
Py_ssize_t index, Py_ssize_t size, char *ptr); Py_ssize_t index, Py_ssize_t size, char *ptr);
extern void Extend_Error_Info(PyObject *exc_class, char *fmt, ...); extern void _ctypes_extend_error(PyObject *exc_class, char *fmt, ...);
struct basespec { struct basespec {
CDataObject *base; CDataObject *base;
...@@ -331,32 +331,31 @@ struct basespec { ...@@ -331,32 +331,31 @@ struct basespec {
extern char basespec_string[]; extern char basespec_string[];
extern ffi_type *GetType(PyObject *obj); extern ffi_type *_ctypes_get_ffi_type(PyObject *obj);
/* exception classes */ /* exception classes */
extern PyObject *PyExc_ArgError; extern PyObject *PyExc_ArgError;
extern char *conversion_mode_encoding; extern char *_ctypes_conversion_encoding;
extern char *conversion_mode_errors; extern char *_ctypes_conversion_errors;
#if defined(HAVE_WCHAR_H) #if defined(HAVE_WCHAR_H)
# define CTYPES_UNICODE # define CTYPES_UNICODE
#endif #endif
extern void FreeClosure(void *); extern void _ctypes_free_closure(void *);
extern void *MallocClosure(void); extern void *_ctypes_alloc_closure(void);
extern void _AddTraceback(char *, char *, int); extern void _ctypes_add_traceback(char *, char *, int);
extern PyObject *CData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr); extern PyObject *PyCData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr);
extern char *alloc_format_string(const char *prefix, const char *suffix); extern char *_ctypes_alloc_format_string(const char *prefix, const char *suffix);
/* XXX better name needed! */ extern int _ctypes_simple_instance(PyObject *obj);
extern int IsSimpleSubType(PyObject *obj);
extern PyObject *_pointer_type_cache; extern PyObject *_ctypes_ptrtype_cache;
PyObject *get_error_object(int **pspace); PyObject *_ctypes_get_errobj(int **pspace);
#ifdef MS_WIN32 #ifdef MS_WIN32
extern PyObject *ComError; extern PyObject *ComError;
......
Modules/_ctypes/malloc_closure.c
View file @ 34596a90
...@@ -89,7 +89,7 @@ static void more_core(void) ...@@ -89,7 +89,7 @@ static void more_core(void)
/******************************************************************/ /******************************************************************/
/* put the item back into the free list */ /* put the item back into the free list */
void FreeClosure(void *p) void _ctypes_free_closure(void *p)
{ {
ITEM *item = (ITEM *)p; ITEM *item = (ITEM *)p;
item->next = free_list; item->next = free_list;
...@@ -97,7 +97,7 @@ void FreeClosure(void *p) ...@@ -97,7 +97,7 @@ void FreeClosure(void *p)
} }
/* return one item from the free list, allocating more if needed */ /* return one item from the free list, allocating more if needed */
void *MallocClosure(void) void *_ctypes_alloc_closure(void)
{ {
ITEM *item; ITEM *item;
if (!free_list) if (!free_list)
......
Modules/_ctypes/stgdict.c
View file @ 34596a90
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* PyDict_SetItem() (ma_lookup is NULL) * PyDict_SetItem() (ma_lookup is NULL)
*/ */
static int static int
StgDict_init(StgDictObject *self, PyObject *args, PyObject *kwds) PyCStgDict_init(StgDictObject *self, PyObject *args, PyObject *kwds)
{ {
if (PyDict_Type.tp_init((PyObject *)self, args, kwds) < 0) if (PyDict_Type.tp_init((PyObject *)self, args, kwds) < 0)
return -1; return -1;
...@@ -28,7 +28,7 @@ StgDict_init(StgDictObject *self, PyObject *args, PyObject *kwds) ...@@ -28,7 +28,7 @@ StgDict_init(StgDictObject *self, PyObject *args, PyObject *kwds)
} }
static int static int
StgDict_clear(StgDictObject *self) PyCStgDict_clear(StgDictObject *self)
{ {
Py_CLEAR(self->proto); Py_CLEAR(self->proto);
Py_CLEAR(self->argtypes); Py_CLEAR(self->argtypes);
...@@ -39,9 +39,9 @@ StgDict_clear(StgDictObject *self) ...@@ -39,9 +39,9 @@ StgDict_clear(StgDictObject *self)
} }
static void static void
StgDict_dealloc(StgDictObject *self) PyCStgDict_dealloc(StgDictObject *self)
{ {
StgDict_clear(self); PyCStgDict_clear(self);
PyMem_Free(self->format); PyMem_Free(self->format);
PyMem_Free(self->shape); PyMem_Free(self->shape);
PyMem_Free(self->ffi_type_pointer.elements); PyMem_Free(self->ffi_type_pointer.elements);
...@@ -49,12 +49,12 @@ StgDict_dealloc(StgDictObject *self) ...@@ -49,12 +49,12 @@ StgDict_dealloc(StgDictObject *self)
} }
int int
StgDict_clone(StgDictObject *dst, StgDictObject *src) PyCStgDict_clone(StgDictObject *dst, StgDictObject *src)
{ {
char *d, *s; char *d, *s;
Py_ssize_t size; Py_ssize_t size;
StgDict_clear(dst); PyCStgDict_clear(dst);
PyMem_Free(dst->ffi_type_pointer.elements); PyMem_Free(dst->ffi_type_pointer.elements);
PyMem_Free(dst->format); PyMem_Free(dst->format);
dst->format = NULL; dst->format = NULL;
...@@ -102,12 +102,12 @@ StgDict_clone(StgDictObject *dst, StgDictObject *src) ...@@ -102,12 +102,12 @@ StgDict_clone(StgDictObject *dst, StgDictObject *src)
return 0; return 0;
} }
PyTypeObject StgDict_Type = { PyTypeObject PyCStgDict_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"StgDict", "StgDict",
sizeof(StgDictObject), sizeof(StgDictObject),
0, 0,
(destructor)StgDict_dealloc, /* tp_dealloc */ (destructor)PyCStgDict_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
...@@ -138,7 +138,7 @@ PyTypeObject StgDict_Type = { ...@@ -138,7 +138,7 @@ PyTypeObject StgDict_Type = {
0, /* tp_descr_get */ 0, /* tp_descr_get */
0, /* tp_descr_set */ 0, /* tp_descr_set */
0, /* tp_dictoffset */ 0, /* tp_dictoffset */
(initproc)StgDict_init, /* tp_init */ (initproc)PyCStgDict_init, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
0, /* tp_new */ 0, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
...@@ -153,7 +153,7 @@ PyType_stgdict(PyObject *obj) ...@@ -153,7 +153,7 @@ PyType_stgdict(PyObject *obj)
if (!PyType_Check(obj)) if (!PyType_Check(obj))
return NULL; return NULL;
type = (PyTypeObject *)obj; type = (PyTypeObject *)obj;
if (!type->tp_dict || !StgDict_CheckExact(type->tp_dict)) if (!type->tp_dict || !PyCStgDict_CheckExact(type->tp_dict))
return NULL; return NULL;
return (StgDictObject *)type->tp_dict; return (StgDictObject *)type->tp_dict;
} }
...@@ -167,7 +167,7 @@ StgDictObject * ...@@ -167,7 +167,7 @@ StgDictObject *
PyObject_stgdict(PyObject *self) PyObject_stgdict(PyObject *self)
{ {
PyTypeObject *type = self->ob_type; PyTypeObject *type = self->ob_type;
if (!type->tp_dict || !StgDict_CheckExact(type->tp_dict)) if (!type->tp_dict || !PyCStgDict_CheckExact(type->tp_dict))
return NULL; return NULL;
return (StgDictObject *)type->tp_dict; return (StgDictObject *)type->tp_dict;
} }
...@@ -207,7 +207,7 @@ MakeFields(PyObject *type, CFieldObject *descr, ...@@ -207,7 +207,7 @@ MakeFields(PyObject *type, CFieldObject *descr,
Py_DECREF(fieldlist); Py_DECREF(fieldlist);
return -1; return -1;
} }
if (Py_TYPE(fdescr) != &CField_Type) { if (Py_TYPE(fdescr) != &PyCField_Type) {
PyErr_SetString(PyExc_TypeError, "unexpected type"); PyErr_SetString(PyExc_TypeError, "unexpected type");
Py_DECREF(fdescr); Py_DECREF(fdescr);
Py_DECREF(fieldlist); Py_DECREF(fieldlist);
...@@ -224,13 +224,13 @@ MakeFields(PyObject *type, CFieldObject *descr, ...@@ -224,13 +224,13 @@ MakeFields(PyObject *type, CFieldObject *descr,
} }
continue; continue;
} }
new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&CField_Type, NULL); new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type, NULL);
if (new_descr == NULL) { if (new_descr == NULL) {
Py_DECREF(fdescr); Py_DECREF(fdescr);
Py_DECREF(fieldlist); Py_DECREF(fieldlist);
return -1; return -1;
} }
assert(Py_TYPE(new_descr) == &CField_Type); assert(Py_TYPE(new_descr) == &PyCField_Type);
new_descr->size = fdescr->size; new_descr->size = fdescr->size;
new_descr->offset = fdescr->offset + offset; new_descr->offset = fdescr->offset + offset;
new_descr->index = fdescr->index + index; new_descr->index = fdescr->index + index;
...@@ -278,7 +278,7 @@ MakeAnonFields(PyObject *type) ...@@ -278,7 +278,7 @@ MakeAnonFields(PyObject *type)
Py_DECREF(anon_names); Py_DECREF(anon_names);
return -1; return -1;
} }
assert(Py_TYPE(descr) == &CField_Type); assert(Py_TYPE(descr) == &PyCField_Type);
descr->anonymous = 1; descr->anonymous = 1;
/* descr is in the field descriptor. */ /* descr is in the field descriptor. */
...@@ -301,7 +301,7 @@ MakeAnonFields(PyObject *type) ...@@ -301,7 +301,7 @@ MakeAnonFields(PyObject *type)
and create an StgDictObject. Used for Structure and Union subclasses. and create an StgDictObject. Used for Structure and Union subclasses.
*/ */
int int
StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
{ {
StgDictObject *stgdict, *basedict; StgDictObject *stgdict, *basedict;
Py_ssize_t len, offset, size, align, i; Py_ssize_t len, offset, size, align, i;
...@@ -410,12 +410,12 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) ...@@ -410,12 +410,12 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
assert(stgdict->format == NULL); assert(stgdict->format == NULL);
if (isStruct && !isPacked) { if (isStruct && !isPacked) {
stgdict->format = alloc_format_string(NULL, "T{"); stgdict->format = _ctypes_alloc_format_string(NULL, "T{");
} else { } else {
/* PEP3118 doesn't support union, or packed structures (well, /* PEP3118 doesn't support union, or packed structures (well,
only standard packing, but we dont support the pep for only standard packing, but we dont support the pep for
that). Use 'B' for bytes. */ that). Use 'B' for bytes. */
stgdict->format = alloc_format_string(NULL, "B"); stgdict->format = _ctypes_alloc_format_string(NULL, "B");
} }
#define realdict ((PyObject *)&stgdict->dict) #define realdict ((PyObject *)&stgdict->dict)
...@@ -456,9 +456,9 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) ...@@ -456,9 +456,9 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
case FFI_TYPE_SINT8: case FFI_TYPE_SINT8:
case FFI_TYPE_SINT16: case FFI_TYPE_SINT16:
case FFI_TYPE_SINT32: case FFI_TYPE_SINT32:
if (dict->getfunc != getentry("c")->getfunc if (dict->getfunc != _ctypes_get_fielddesc("c")->getfunc
#ifdef CTYPES_UNICODE #ifdef CTYPES_UNICODE
&& dict->getfunc != getentry("u")->getfunc && dict->getfunc != _ctypes_get_fielddesc("u")->getfunc
#endif #endif
) )
break; break;
...@@ -488,7 +488,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) ...@@ -488,7 +488,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
sprintf(buf, "%s:%s:", fieldfmt, fieldname); sprintf(buf, "%s:%s:", fieldfmt, fieldname);
ptr = stgdict->format; ptr = stgdict->format;
stgdict->format = alloc_format_string(stgdict->format, buf); stgdict->format = _ctypes_alloc_format_string(stgdict->format, buf);
PyMem_Free(ptr); PyMem_Free(ptr);
if (stgdict->format == NULL) { if (stgdict->format == NULL) {
...@@ -497,7 +497,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) ...@@ -497,7 +497,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
} }
} }
if (isStruct) { if (isStruct) {
prop = CField_FromDesc(desc, i, prop = PyCField_FromDesc(desc, i,
&field_size, bitsize, &bitofs, &field_size, bitsize, &bitofs,
&size, &offset, &align, &size, &offset, &align,
pack, big_endian); pack, big_endian);
...@@ -505,7 +505,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) ...@@ -505,7 +505,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
size = 0; size = 0;
offset = 0; offset = 0;
align = 0; align = 0;
prop = CField_FromDesc(desc, i, prop = PyCField_FromDesc(desc, i,
&field_size, bitsize, &bitofs, &field_size, bitsize, &bitofs,
&size, &offset, &align, &size, &offset, &align,
pack, big_endian); pack, big_endian);
...@@ -529,7 +529,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct) ...@@ -529,7 +529,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
if (isStruct && !isPacked) { if (isStruct && !isPacked) {
char *ptr = stgdict->format; char *ptr = stgdict->format;
stgdict->format = alloc_format_string(stgdict->format, "}"); stgdict->format = _ctypes_alloc_format_string(stgdict->format, "}");
PyMem_Free(ptr); PyMem_Free(ptr);
if (stgdict->format == NULL) if (stgdict->format == NULL)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7