mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 22:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

ANSI-fication of the source.

Browse source 
Make the indentation and brace placement internally consistent.
This commit is contained in:
Fred Drake 2000-07-09 04:14:42 +00:00
parent 799124718d
commit 3be9a8a5ed
1 changed files with 106 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Objects/cobject.c
View file

@ -26,9 +26,7 @@ typedef struct {
} PyCObject; } PyCObject;
PyObject * PyObject *
PyCObject_FromVoidPtr(cobj, destr) PyCObject_FromVoidPtr(void *cobj, void (*destr)(void *))
void *cobj;
void (*destr)(void *);
{ {
PyCObject *self; PyCObject *self;
@ -38,38 +36,36 @@ PyCObject_FromVoidPtr(cobj, destr)
self->cobject=cobj; self->cobject=cobj;
self->destructor=destr; self->destructor=destr;
self->desc=NULL; self->desc=NULL;
return (PyObject *)self; return (PyObject *)self;
} }
PyObject * PyObject *
PyCObject_FromVoidPtrAndDesc(cobj, desc, destr) PyCObject_FromVoidPtrAndDesc(void *cobj, void *desc,
void *cobj; void (*destr)(void *, void *))
void *desc;
void (*destr)(void *, void *);
{ {
PyCObject *self; PyCObject *self;
if (!desc) { if (!desc) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"PyCObject_FromVoidPtrAndDesc called with null description"); "PyCObject_FromVoidPtrAndDesc called with null"
" description");
return NULL; return NULL;
} }
self = PyObject_NEW(PyCObject, &PyCObject_Type); self = PyObject_NEW(PyCObject, &PyCObject_Type);
if (self == NULL) if (self == NULL)
return NULL; return NULL;
self->cobject=cobj; self->cobject=cobj;
self->destructor=(destructor1)destr; self->destructor=(destructor1)destr;
self->desc=desc; self->desc=desc;
return (PyObject *)self; return (PyObject *)self;
} }
void * void *
PyCObject_AsVoidPtr(self) PyCObject_AsVoidPtr(PyObject *self)
PyObject *self;
{
if(self)
{ {
if (self) {
if (self->ob_type == &PyCObject_Type) if (self->ob_type == &PyCObject_Type)
return ((PyCObject *)self)->cobject; return ((PyCObject *)self)->cobject;
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
@ -82,11 +78,9 @@ PyCObject_AsVoidPtr(self)
} }
void * void *
PyCObject_GetDesc(self) PyCObject_GetDesc(PyObject *self)
PyObject *self;
{
if(self)
{ {
if (self) {
if (self->ob_type == &PyCObject_Type) if (self->ob_type == &PyCObject_Type)
return ((PyCObject *)self)->desc; return ((PyCObject *)self)->desc;
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
@ -99,32 +93,25 @@ PyCObject_GetDesc(self)
} }
void * void *
PyCObject_Import(module_name, name) PyCObject_Import(char *module_name, char *name)
char *module_name;
char *name;
{ {
PyObject *m, *c; PyObject *m, *c;
void *r = NULL; void *r = NULL;
if((m=PyImport_ImportModule(module_name))) if ((m = PyImport_ImportModule(module_name))) {
{ if ((c = PyObject_GetAttrString(m,name))) {
if((c=PyObject_GetAttrString(m,name)))
{
r = PyCObject_AsVoidPtr(c); r = PyCObject_AsVoidPtr(c);
Py_DECREF(c); Py_DECREF(c);
} }
Py_DECREF(m); Py_DECREF(m);
} }
return r; return r;
} }
static void static void
PyCObject_dealloc(self) PyCObject_dealloc(PyCObject *self)
PyCObject *self;
{
if(self->destructor)
{ {
if (self->destructor) {
if(self->desc) if(self->desc)
((destructor2)(self->destructor))(self->cobject, self->desc); ((destructor2)(self->destructor))(self->cobject, self->desc);
else else
@ -140,8 +127,7 @@ static char PyCObject_Type__doc__[] =
C objects are used for communication between extension modules. They\n\ 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\ 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\ 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 = { PyTypeObject PyCObject_Type = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(&PyType_Type)