mirror of
https://github.com/python/cpython
synced 2024-09-21 00:41:48 +00:00
ANSI-fication of the source.
Make the indentation and brace placement internally consistent.
This commit is contained in:
parent
799124718d
commit
3be9a8a5ed
|
@ -26,9 +26,7 @@ typedef struct {
|
|||
} PyCObject;
|
||||
|
||||
PyObject *
|
||||
PyCObject_FromVoidPtr(cobj, destr)
|
||||
void *cobj;
|
||||
void (*destr)(void *);
|
||||
PyCObject_FromVoidPtr(void *cobj, void (*destr)(void *))
|
||||
{
|
||||
PyCObject *self;
|
||||
|
||||
|
@ -38,38 +36,36 @@ PyCObject_FromVoidPtr(cobj, destr)
|
|||
self->cobject=cobj;
|
||||
self->destructor=destr;
|
||||
self->desc=NULL;
|
||||
|
||||
return (PyObject *)self;
|
||||
}
|
||||
|
||||
PyObject *
|
||||
PyCObject_FromVoidPtrAndDesc(cobj, desc, destr)
|
||||
void *cobj;
|
||||
void *desc;
|
||||
void (*destr)(void *, void *);
|
||||
PyCObject_FromVoidPtrAndDesc(void *cobj, void *desc,
|
||||
void (*destr)(void *, void *))
|
||||
{
|
||||
PyCObject *self;
|
||||
|
||||
if (!desc) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"PyCObject_FromVoidPtrAndDesc called with null description");
|
||||
"PyCObject_FromVoidPtrAndDesc called with null"
|
||||
" description");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
self = PyObject_NEW(PyCObject, &PyCObject_Type);
|
||||
if (self == NULL)
|
||||
return NULL;
|
||||
self->cobject=cobj;
|
||||
self->destructor=(destructor1)destr;
|
||||
self->desc=desc;
|
||||
|
||||
return (PyObject *)self;
|
||||
}
|
||||
|
||||
void *
|
||||
PyCObject_AsVoidPtr(self)
|
||||
PyObject *self;
|
||||
{
|
||||
if(self)
|
||||
PyCObject_AsVoidPtr(PyObject *self)
|
||||
{
|
||||
if (self) {
|
||||
if (self->ob_type == &PyCObject_Type)
|
||||
return ((PyCObject *)self)->cobject;
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
|
@ -82,11 +78,9 @@ PyCObject_AsVoidPtr(self)
|
|||
}
|
||||
|
||||
void *
|
||||
PyCObject_GetDesc(self)
|
||||
PyObject *self;
|
||||
{
|
||||
if(self)
|
||||
PyCObject_GetDesc(PyObject *self)
|
||||
{
|
||||
if (self) {
|
||||
if (self->ob_type == &PyCObject_Type)
|
||||
return ((PyCObject *)self)->desc;
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
|
@ -99,32 +93,25 @@ PyCObject_GetDesc(self)
|
|||
}
|
||||
|
||||
void *
|
||||
PyCObject_Import(module_name, name)
|
||||
char *module_name;
|
||||
char *name;
|
||||
PyCObject_Import(char *module_name, char *name)
|
||||
{
|
||||
PyObject *m, *c;
|
||||
void *r = NULL;
|
||||
|
||||
if((m=PyImport_ImportModule(module_name)))
|
||||
{
|
||||
if((c=PyObject_GetAttrString(m,name)))
|
||||
{
|
||||
if ((m = PyImport_ImportModule(module_name))) {
|
||||
if ((c = PyObject_GetAttrString(m,name))) {
|
||||
r = PyCObject_AsVoidPtr(c);
|
||||
Py_DECREF(c);
|
||||
}
|
||||
Py_DECREF(m);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static void
|
||||
PyCObject_dealloc(self)
|
||||
PyCObject *self;
|
||||
{
|
||||
if(self->destructor)
|
||||
PyCObject_dealloc(PyCObject *self)
|
||||
{
|
||||
if (self->destructor) {
|
||||
if(self->desc)
|
||||
((destructor2)(self->destructor))(self->cobject, self->desc);
|
||||
else
|
||||
|
@ -140,8 +127,7 @@ static char PyCObject_Type__doc__[] =
|
|||
C objects are used for communication between extension modules. They\n\
|
||||
provide a way for an extension module to export a C interface to other\n\
|
||||
extension modules, so that extension modules can use the Python import\n\
|
||||
mechanism to link to one another.\n"
|
||||
;
|
||||
mechanism to link to one another.";
|
||||
|
||||
PyTypeObject PyCObject_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
|
|
Loading…
Reference in a new issue