From 0b1eafbfd841149f61b47be54713a642f8538a6a Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 17 Feb 2007 12:18:00 +0000 Subject: [PATCH] General: Fix lots of whitespace issues. --- catacomb-python.h | 16 ++++++++-------- catacomb.c | 6 +++--- util.c | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/catacomb-python.h b/catacomb-python.h index 79034af..dafe0fd 100644 --- a/catacomb-python.h +++ b/catacomb-python.h @@ -7,7 +7,7 @@ * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -166,7 +166,7 @@ #define INSERT(name, ob) do { \ PyObject *_o = (PyObject *)(ob); \ - Py_INCREF(_o); \ + Py_INCREF(_o); \ PyModule_AddObject(mod, name, _o); \ } while (0) @@ -267,7 +267,7 @@ extern PyMethodDef *donemethods(void); METH (items, "D.items() -> LIST") \ METH (iterkeys, "D.iterkeys() -> ITER") \ METH (itervalues, "D.itervalues() -> ITER") \ - METH (iteritems, "D.iteritems() -> ITER") \ + METH (iteritems, "D.iteritems() -> ITER") \ KWMETH(get, "D.get(KEY, [default = None]) -> VALUE") \ #define GMAP_DOMETHODS(METH, KWMETH) \ @@ -338,7 +338,7 @@ typedef struct fe_pyobj { field *f; mp *x; } fe_pyobj; - + extern PyTypeObject *field_pytype; extern PyTypeObject *primefield_pytype; extern PyTypeObject *niceprimefield_pytype; @@ -394,7 +394,7 @@ typedef struct ecinfo_pyobj { ec_info ei; PyObject *cobj; } ecinfo_pyobj; - + extern PyTypeObject *ecinfo_pytype; #define ECINFO_PYCHECK(o) PyObject_TypeCheck((o), ecinfo_pytype) #define ECINFO_EI(o) (&((ecinfo_pyobj *)(o))->ei) @@ -560,7 +560,7 @@ extern PyObject *gmac_pywrap(PyObject *, gmac *, unsigned); extern int convgmac(PyObject *, void *); /*----- Key generation ----------------------------------------------------*/ - + typedef struct pfilt_pyobj { PyObject_HEAD pfilt f; diff --git a/catacomb.c b/catacomb.c index 65d3985..29f09ac 100644 --- a/catacomb.c +++ b/catacomb.c @@ -7,7 +7,7 @@ * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/util.c b/util.c index 7201401..89130cb 100644 --- a/util.c +++ b/util.c @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -278,7 +278,7 @@ static void iter_pydealloc(PyObject *me) static PyObject *itemiter_pynext(PyObject *me) { PyObject *k = 0, *v = 0, *rc = 0; - + if ((k = PyIter_Next(ITER_I(me))) != 0 && (v = PyObject_GetItem(ITER_MAP(me), k)) != 0) rc = Py_BuildValue("(OO)", k, v); @@ -337,7 +337,7 @@ static PyTypeObject itemiter_pytype_skel = { static PyObject *valiter_pynext(PyObject *me) { PyObject *k = 0, *rc = 0; - + if ((k = PyIter_Next(ITER_I(me))) != 0) rc = PyObject_GetItem(ITER_MAP(me), k); Py_XDECREF(k); @@ -403,7 +403,7 @@ PySequenceMethods gmap_pysequence = { PyMapping_HasKey, /* @sq_contains@ */ 0, /* @sq_inplace_concat@ */ 0 /* @sq_inplace_repeat@ */ -}; +}; int gmap_pysize(PyObject *me) { @@ -454,7 +454,7 @@ PyObject *gmapmeth_values(PyObject *me, PyObject *arg) (l = PyList_New(0)) == 0 || (i = PyObject_GetIter(me)) == 0) goto done; - while ((k = PyIter_Next(i)) != 0) { + while ((k = PyIter_Next(i)) != 0) { if ((v = PyObject_GetItem(me, k)) == 0 || PyList_Append(l, v)) err = -1; -- 2.11.0