Untabify C files. Will watch buildbots.
diff --git a/Modules/cgensupport.c b/Modules/cgensupport.c
index 7e7d0ff..aad43a2 100644
--- a/Modules/cgensupport.c
+++ b/Modules/cgensupport.c
@@ -13,158 +13,158 @@
int
PyArg_GetObject(register PyObject *args, int nargs, int i, PyObject **p_arg)
{
- if (nargs != 1) {
- if (args == NULL || !PyTuple_Check(args) ||
- nargs != PyTuple_Size(args) ||
- i < 0 || i >= nargs) {
- return PyErr_BadArgument();
- }
- else {
- args = PyTuple_GetItem(args, i);
- }
- }
- if (args == NULL) {
- return PyErr_BadArgument();
- }
- *p_arg = args;
- return 1;
+ if (nargs != 1) {
+ if (args == NULL || !PyTuple_Check(args) ||
+ nargs != PyTuple_Size(args) ||
+ i < 0 || i >= nargs) {
+ return PyErr_BadArgument();
+ }
+ else {
+ args = PyTuple_GetItem(args, i);
+ }
+ }
+ if (args == NULL) {
+ return PyErr_BadArgument();
+ }
+ *p_arg = args;
+ return 1;
}
int
PyArg_GetLong(register PyObject *args, int nargs, int i, long *p_arg)
{
- if (nargs != 1) {
- if (args == NULL || !PyTuple_Check(args) ||
- nargs != PyTuple_Size(args) ||
- i < 0 || i >= nargs) {
- return PyErr_BadArgument();
- }
- args = PyTuple_GetItem(args, i);
- }
- if (args == NULL || !PyInt_Check(args)) {
- return PyErr_BadArgument();
- }
- *p_arg = PyInt_AsLong(args);
- return 1;
+ if (nargs != 1) {
+ if (args == NULL || !PyTuple_Check(args) ||
+ nargs != PyTuple_Size(args) ||
+ i < 0 || i >= nargs) {
+ return PyErr_BadArgument();
+ }
+ args = PyTuple_GetItem(args, i);
+ }
+ if (args == NULL || !PyInt_Check(args)) {
+ return PyErr_BadArgument();
+ }
+ *p_arg = PyInt_AsLong(args);
+ return 1;
}
int
PyArg_GetShort(register PyObject *args, int nargs, int i, short *p_arg)
{
- long x;
- if (!PyArg_GetLong(args, nargs, i, &x))
- return 0;
- *p_arg = (short) x;
- return 1;
+ long x;
+ if (!PyArg_GetLong(args, nargs, i, &x))
+ return 0;
+ *p_arg = (short) x;
+ return 1;
}
static int
extractdouble(register PyObject *v, double *p_arg)
{
- if (v == NULL) {
- /* Fall through to error return at end of function */
- }
- else if (PyFloat_Check(v)) {
- *p_arg = PyFloat_AS_DOUBLE((PyFloatObject *)v);
- return 1;
- }
- else if (PyInt_Check(v)) {
- *p_arg = PyInt_AS_LONG((PyIntObject *)v);
- return 1;
- }
- else if (PyLong_Check(v)) {
- *p_arg = PyLong_AsDouble(v);
- return 1;
- }
- return PyErr_BadArgument();
+ if (v == NULL) {
+ /* Fall through to error return at end of function */
+ }
+ else if (PyFloat_Check(v)) {
+ *p_arg = PyFloat_AS_DOUBLE((PyFloatObject *)v);
+ return 1;
+ }
+ else if (PyInt_Check(v)) {
+ *p_arg = PyInt_AS_LONG((PyIntObject *)v);
+ return 1;
+ }
+ else if (PyLong_Check(v)) {
+ *p_arg = PyLong_AsDouble(v);
+ return 1;
+ }
+ return PyErr_BadArgument();
}
static int
extractfloat(register PyObject *v, float *p_arg)
{
- if (v == NULL) {
- /* Fall through to error return at end of function */
- }
- else if (PyFloat_Check(v)) {
- *p_arg = (float) PyFloat_AS_DOUBLE((PyFloatObject *)v);
- return 1;
- }
- else if (PyInt_Check(v)) {
- *p_arg = (float) PyInt_AS_LONG((PyIntObject *)v);
- return 1;
- }
- else if (PyLong_Check(v)) {
- *p_arg = (float) PyLong_AsDouble(v);
- return 1;
- }
- return PyErr_BadArgument();
+ if (v == NULL) {
+ /* Fall through to error return at end of function */
+ }
+ else if (PyFloat_Check(v)) {
+ *p_arg = (float) PyFloat_AS_DOUBLE((PyFloatObject *)v);
+ return 1;
+ }
+ else if (PyInt_Check(v)) {
+ *p_arg = (float) PyInt_AS_LONG((PyIntObject *)v);
+ return 1;
+ }
+ else if (PyLong_Check(v)) {
+ *p_arg = (float) PyLong_AsDouble(v);
+ return 1;
+ }
+ return PyErr_BadArgument();
}
int
PyArg_GetFloat(register PyObject *args, int nargs, int i, float *p_arg)
{
- PyObject *v;
- float x;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (!extractfloat(v, &x))
- return 0;
- *p_arg = x;
- return 1;
+ PyObject *v;
+ float x;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (!extractfloat(v, &x))
+ return 0;
+ *p_arg = x;
+ return 1;
}
int
PyArg_GetString(PyObject *args, int nargs, int i, string *p_arg)
{
- PyObject *v;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (!PyString_Check(v)) {
- return PyErr_BadArgument();
- }
- *p_arg = PyString_AsString(v);
- return 1;
+ PyObject *v;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (!PyString_Check(v)) {
+ return PyErr_BadArgument();
+ }
+ *p_arg = PyString_AsString(v);
+ return 1;
}
int
PyArg_GetChar(PyObject *args, int nargs, int i, char *p_arg)
{
- string x;
- if (!PyArg_GetString(args, nargs, i, &x))
- return 0;
- if (x[0] == '\0' || x[1] != '\0') {
- /* Not exactly one char */
- return PyErr_BadArgument();
- }
- *p_arg = x[0];
- return 1;
+ string x;
+ if (!PyArg_GetString(args, nargs, i, &x))
+ return 0;
+ if (x[0] == '\0' || x[1] != '\0') {
+ /* Not exactly one char */
+ return PyErr_BadArgument();
+ }
+ *p_arg = x[0];
+ return 1;
}
int
PyArg_GetLongArraySize(PyObject *args, int nargs, int i, long *p_arg)
{
- PyObject *v;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (PyTuple_Check(v)) {
- *p_arg = PyTuple_Size(v);
- return 1;
- }
- if (PyList_Check(v)) {
- *p_arg = PyList_Size(v);
- return 1;
- }
- return PyErr_BadArgument();
+ PyObject *v;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (PyTuple_Check(v)) {
+ *p_arg = PyTuple_Size(v);
+ return 1;
+ }
+ if (PyList_Check(v)) {
+ *p_arg = PyList_Size(v);
+ return 1;
+ }
+ return PyErr_BadArgument();
}
int
PyArg_GetShortArraySize(PyObject *args, int nargs, int i, short *p_arg)
{
- long x;
- if (!PyArg_GetLongArraySize(args, nargs, i, &x))
- return 0;
- *p_arg = (short) x;
- return 1;
+ long x;
+ if (!PyArg_GetLongArraySize(args, nargs, i, &x))
+ return 0;
+ *p_arg = (short) x;
+ return 1;
}
/* XXX The following four are too similar. Should share more code. */
@@ -172,139 +172,139 @@
int
PyArg_GetLongArray(PyObject *args, int nargs, int i, int n, long *p_arg)
{
- PyObject *v, *w;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (PyTuple_Check(v)) {
- if (PyTuple_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyTuple_GetItem(v, i);
- if (!PyInt_Check(w)) {
- return PyErr_BadArgument();
- }
- p_arg[i] = PyInt_AsLong(w);
- }
- return 1;
- }
- else if (PyList_Check(v)) {
- if (PyList_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyList_GetItem(v, i);
- if (!PyInt_Check(w)) {
- return PyErr_BadArgument();
- }
- p_arg[i] = PyInt_AsLong(w);
- }
- return 1;
- }
- else {
- return PyErr_BadArgument();
- }
+ PyObject *v, *w;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (PyTuple_Check(v)) {
+ if (PyTuple_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyTuple_GetItem(v, i);
+ if (!PyInt_Check(w)) {
+ return PyErr_BadArgument();
+ }
+ p_arg[i] = PyInt_AsLong(w);
+ }
+ return 1;
+ }
+ else if (PyList_Check(v)) {
+ if (PyList_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyList_GetItem(v, i);
+ if (!PyInt_Check(w)) {
+ return PyErr_BadArgument();
+ }
+ p_arg[i] = PyInt_AsLong(w);
+ }
+ return 1;
+ }
+ else {
+ return PyErr_BadArgument();
+ }
}
int
PyArg_GetShortArray(PyObject *args, int nargs, int i, int n, short *p_arg)
{
- PyObject *v, *w;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (PyTuple_Check(v)) {
- if (PyTuple_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyTuple_GetItem(v, i);
- if (!PyInt_Check(w)) {
- return PyErr_BadArgument();
- }
- p_arg[i] = (short) PyInt_AsLong(w);
- }
- return 1;
- }
- else if (PyList_Check(v)) {
- if (PyList_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyList_GetItem(v, i);
- if (!PyInt_Check(w)) {
- return PyErr_BadArgument();
- }
- p_arg[i] = (short) PyInt_AsLong(w);
- }
- return 1;
- }
- else {
- return PyErr_BadArgument();
- }
+ PyObject *v, *w;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (PyTuple_Check(v)) {
+ if (PyTuple_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyTuple_GetItem(v, i);
+ if (!PyInt_Check(w)) {
+ return PyErr_BadArgument();
+ }
+ p_arg[i] = (short) PyInt_AsLong(w);
+ }
+ return 1;
+ }
+ else if (PyList_Check(v)) {
+ if (PyList_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyList_GetItem(v, i);
+ if (!PyInt_Check(w)) {
+ return PyErr_BadArgument();
+ }
+ p_arg[i] = (short) PyInt_AsLong(w);
+ }
+ return 1;
+ }
+ else {
+ return PyErr_BadArgument();
+ }
}
int
PyArg_GetDoubleArray(PyObject *args, int nargs, int i, int n, double *p_arg)
{
- PyObject *v, *w;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (PyTuple_Check(v)) {
- if (PyTuple_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyTuple_GetItem(v, i);
- if (!extractdouble(w, &p_arg[i]))
- return 0;
- }
- return 1;
- }
- else if (PyList_Check(v)) {
- if (PyList_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyList_GetItem(v, i);
- if (!extractdouble(w, &p_arg[i]))
- return 0;
- }
- return 1;
- }
- else {
- return PyErr_BadArgument();
- }
+ PyObject *v, *w;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (PyTuple_Check(v)) {
+ if (PyTuple_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyTuple_GetItem(v, i);
+ if (!extractdouble(w, &p_arg[i]))
+ return 0;
+ }
+ return 1;
+ }
+ else if (PyList_Check(v)) {
+ if (PyList_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyList_GetItem(v, i);
+ if (!extractdouble(w, &p_arg[i]))
+ return 0;
+ }
+ return 1;
+ }
+ else {
+ return PyErr_BadArgument();
+ }
}
int
PyArg_GetFloatArray(PyObject *args, int nargs, int i, int n, float *p_arg)
{
- PyObject *v, *w;
- if (!PyArg_GetObject(args, nargs, i, &v))
- return 0;
- if (PyTuple_Check(v)) {
- if (PyTuple_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyTuple_GetItem(v, i);
- if (!extractfloat(w, &p_arg[i]))
- return 0;
- }
- return 1;
- }
- else if (PyList_Check(v)) {
- if (PyList_Size(v) != n) {
- return PyErr_BadArgument();
- }
- for (i = 0; i < n; i++) {
- w = PyList_GetItem(v, i);
- if (!extractfloat(w, &p_arg[i]))
- return 0;
- }
- return 1;
- }
- else {
- return PyErr_BadArgument();
- }
+ PyObject *v, *w;
+ if (!PyArg_GetObject(args, nargs, i, &v))
+ return 0;
+ if (PyTuple_Check(v)) {
+ if (PyTuple_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyTuple_GetItem(v, i);
+ if (!extractfloat(w, &p_arg[i]))
+ return 0;
+ }
+ return 1;
+ }
+ else if (PyList_Check(v)) {
+ if (PyList_Size(v) != n) {
+ return PyErr_BadArgument();
+ }
+ for (i = 0; i < n; i++) {
+ w = PyList_GetItem(v, i);
+ if (!extractfloat(w, &p_arg[i]))
+ return 0;
+ }
+ return 1;
+ }
+ else {
+ return PyErr_BadArgument();
+ }
}