ANSI-fication of the source.

Make the indentation and brace placement internally consistent.

diff --git a/Objects/cobject.c b/Objects/cobject.c
index 06c29f00ce4db1e89d98aa2262ac335e782f6e44..48abb4a645d7ff1a500fe98c13cf7d1a76b1796f 100644 (file)
--- a/Objects/cobject.c
+++ b/Objects/cobject.c
@@ -19,118 +19,105 @@ typedef void (*destructor1)(void *);
 typedef void (*destructor2)(void *, void*);
 
 typedef struct {
-       PyObject_HEAD
-       void *cobject;
-        void *desc;
-       void (*destructor)(void *);
+    PyObject_HEAD
+    void *cobject;
+    void *desc;
+    void (*destructor)(void *);
 } PyCObject;
 
 PyObject *
-PyCObject_FromVoidPtr(cobj, destr)
-       void *cobj;
-       void (*destr)(void *);
+PyCObject_FromVoidPtr(void *cobj, void (*destr)(void *))
 {
-       PyCObject *self;
-       
-       self = PyObject_NEW(PyCObject, &PyCObject_Type);
-       if (self == NULL)
-               return NULL;
-       self->cobject=cobj;
-       self->destructor=destr;
-       self->desc=NULL;
-       return (PyObject *)self;
+    PyCObject *self;
+
+    self = PyObject_NEW(PyCObject, &PyCObject_Type);
+    if (self == NULL)
+        return NULL;
+    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;
+    PyCObject *self;
 
-       if(!desc) {
-               PyErr_SetString(PyExc_TypeError,
-                 "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;
+    if (!desc) {
+        PyErr_SetString(PyExc_TypeError,
+                        "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;
+PyCObject_AsVoidPtr(PyObject *self)
 {
-        if(self)
-         {
-           if(self->ob_type == &PyCObject_Type)
-             return ((PyCObject *)self)->cobject;
-           PyErr_SetString(PyExc_TypeError,
-                           "PyCObject_AsVoidPtr with non-C-object");
-         }
-       if(! PyErr_Occurred())
-           PyErr_SetString(PyExc_TypeError,
-                           "PyCObject_AsVoidPtr called with null pointer");
-       return NULL;
+    if (self) {
+        if (self->ob_type == &PyCObject_Type)
+            return ((PyCObject *)self)->cobject;
+        PyErr_SetString(PyExc_TypeError,
+                        "PyCObject_AsVoidPtr with non-C-object");
+    }
+    if (!PyErr_Occurred())
+        PyErr_SetString(PyExc_TypeError,
+                        "PyCObject_AsVoidPtr called with null pointer");
+    return NULL;
 }
 
 void *
-PyCObject_GetDesc(self)
-       PyObject *self;
+PyCObject_GetDesc(PyObject *self)
 {
-        if(self)
-         {
-           if(self->ob_type == &PyCObject_Type)
-             return ((PyCObject *)self)->desc;
-           PyErr_SetString(PyExc_TypeError,
-                           "PyCObject_GetDesc with non-C-object");
-         }
-       if(! PyErr_Occurred())
-           PyErr_SetString(PyExc_TypeError,
-                           "PyCObject_GetDesc called with null pointer");
-       return NULL;
+    if (self) {
+        if (self->ob_type == &PyCObject_Type)
+            return ((PyCObject *)self)->desc;
+        PyErr_SetString(PyExc_TypeError,
+                        "PyCObject_GetDesc with non-C-object");
+    }
+    if (!PyErr_Occurred())
+        PyErr_SetString(PyExc_TypeError,
+                        "PyCObject_GetDesc called with null pointer");
+    return NULL;
 }
 
 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)))
-       {
-         r=PyCObject_AsVoidPtr(c);
-         Py_DECREF(c);
+    PyObject *m, *c;
+    void *r = NULL;
+
+    if ((m = PyImport_ImportModule(module_name))) {
+        if ((c = PyObject_GetAttrString(m,name))) {
+            r = PyCObject_AsVoidPtr(c);
+            Py_DECREF(c);
        }
-      Py_DECREF(m);
+        Py_DECREF(m);
     }
-
-  return r;
+    return r;
 }
 
 static void
-PyCObject_dealloc(self)
-       PyCObject *self;
+PyCObject_dealloc(PyCObject *self)
 {
-        if(self->destructor)
-         {
-           if(self->desc)
-                 ((destructor2)(self->destructor))(self->cobject, self->desc);
-           else
-                 (self->destructor)(self->cobject);
-         }
-       PyObject_DEL(self);
+    if (self->destructor) {
+        if(self->desc)
+            ((destructor2)(self->destructor))(self->cobject, self->desc);
+        else
+            (self->destructor)(self->cobject);
+    }
+    PyObject_DEL(self);
 }
 
 
@@ -140,30 +127,29 @@ 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)
-       0,                              /*ob_size*/
-       "PyCObject",                    /*tp_name*/
-       sizeof(PyCObject),              /*tp_basicsize*/
-       0,                              /*tp_itemsize*/
-       /* methods */
-       (destructor)PyCObject_dealloc,  /*tp_dealloc*/
-       (printfunc)0,           /*tp_print*/
-       (getattrfunc)0, /*tp_getattr*/
-       (setattrfunc)0, /*tp_setattr*/
-       (cmpfunc)0,             /*tp_compare*/
-       (reprfunc)0,            /*tp_repr*/
-       0,                      /*tp_as_number*/
-       0,              /*tp_as_sequence*/
-       0,              /*tp_as_mapping*/
-       (hashfunc)0,            /*tp_hash*/
-       (ternaryfunc)0,         /*tp_call*/
-       (reprfunc)0,            /*tp_str*/
-
-       /* Space for future expansion */
-       0L,0L,0L,0L,
-       PyCObject_Type__doc__ /* Documentation string */
+    PyObject_HEAD_INIT(&PyType_Type)
+    0,                                 /*ob_size*/
+    "PyCObject",                       /*tp_name*/
+    sizeof(PyCObject),                 /*tp_basicsize*/
+    0,                                 /*tp_itemsize*/
+    /* methods */
+    (destructor)PyCObject_dealloc,     /*tp_dealloc*/
+    (printfunc)0,                      /*tp_print*/
+    (getattrfunc)0,                    /*tp_getattr*/
+    (setattrfunc)0,                    /*tp_setattr*/
+    (cmpfunc)0,                                /*tp_compare*/
+    (reprfunc)0,                       /*tp_repr*/
+    0,                                 /*tp_as_number*/
+    0,                                 /*tp_as_sequence*/
+    0,                                 /*tp_as_mapping*/
+    (hashfunc)0,                       /*tp_hash*/
+    (ternaryfunc)0,                    /*tp_call*/
+    (reprfunc)0,                       /*tp_str*/
+
+    /* Space for future expansion */
+    0L,0L,0L,0L,
+    PyCObject_Type__doc__              /* Documentation string */
 };