[Zodb-checkins] CVS: Zope/lib/python/BTrees - BTreeTemplate.c:1.38
Tim Peters
tim.one@comcast.net
Mon, 10 Jun 2002 15:53:48 -0400
Update of /cvs-repository/Zope/lib/python/BTrees
In directory cvs.zope.org:/tmp/cvs-serv12417
Modified Files:
BTreeTemplate.c
Log Message:
Trimmed trailing whitespace.
=== Zope/lib/python/BTrees/BTreeTemplate.c 1.37 => 1.38 === (596/696 lines abridged)
Copyright (c) 2001, 2002 Zope Corporation and Contributors.
All Rights Reserved.
-
+
This software is subject to the provisions of the Zope Public License,
Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
FOR A PARTICULAR PURPOSE
-
+
****************************************************************************/
#define BTREETEMPLATE_C "$Id$\n"
@@ -40,7 +40,7 @@
int min; /* index of child to search */
PyObject *r = NULL; /* result object */
int copied = 1;
-
+
COPY_KEY_FROM_ARG(key, keyarg, copied);
UNLESS (copied) return NULL;
@@ -49,16 +49,16 @@
BTREE_SEARCH(min, self, key, goto Error);
if (self->len)
{
- if (SameType_Check(self, self->data[min].child))
- r = _BTree_get(BTREE(self->data[min].child), keyarg,
+ if (SameType_Check(self, self->data[min].child))
+ r = _BTree_get(BTREE(self->data[min].child), keyarg,
has_key ? has_key + 1: 0);
else
- r = _bucket_get(BUCKET(self->data[min].child), keyarg,
+ r = _bucket_get(BUCKET(self->data[min].child), keyarg,
has_key ? has_key + 1: 0);
}
else
{ /* No data */
- if (has_key)
+ if (has_key)
r = PyInt_FromLong(0);
else
PyErr_SetObject(PyExc_KeyError, keyarg);
@@ -68,7 +68,7 @@
PER_ALLOW_DEACTIVATION(self);
PER_ACCESSED(self);
return r;
-}
[-=- -=- -=- 596 lines omitted -=- -=- -=-]
@@ -1197,7 +1197,7 @@
"minKey([key]) -- Fine the minimum key\n\n"
"If an argument is given, find the minimum >= the argument"},
{"clear", (PyCFunction) BTree_clear, METH_VARARGS,
- "clear() -- Remove all of the items from the BTree"},
+ "clear() -- Remove all of the items from the BTree"},
{"insert", (PyCFunction)BTree_addUnique, METH_VARARGS,
"insert(key, value) -- Add an item if the key is not already used.\n\n"
"Return 1 if the item was added, or 0 otherwise"
@@ -1232,16 +1232,16 @@
{
int c=0;
Bucket *b, *n;
-
- PER_USE_OR_RETURN(self, -1);
+
+ PER_USE_OR_RETURN(self, -1);
b = self->firstbucket;
Py_XINCREF(b);
PER_ALLOW_DEACTIVATION(self);
PER_ACCESSED(self);
- while (b != NULL)
+ while (b != NULL)
{
- PER_USE_OR_RETURN(b, -1);
+ PER_USE_OR_RETURN(b, -1);
c += b->len;
if (nonzero && c)
{
@@ -1304,14 +1304,14 @@
(reprfunc)0, /*tp_str*/
(getattrofunc)0,
0, /*tp_setattro*/
-
+
/* Space for future expansion */
0L,0L,
- "Mapping type implemented as sorted list of items",
+ "Mapping type implemented as sorted list of items",
METHOD_CHAIN(BTree_methods),
- EXTENSIONCLASS_BASICNEW_FLAG
+ EXTENSIONCLASS_BASICNEW_FLAG
#ifdef PERSISTENT
- | PERSISTENT_TYPE_FLAG
+ | PERSISTENT_TYPE_FLAG
#endif
| EXTENSIONCLASS_NOINSTDICT_FLAG,
};