[Zope-Checkins] CVS: Zope3/lib/python/Persistence/BTrees - BTreeTemplate.c:1.21
Tim Peters
tim.one@comcast.net
Mon, 17 Jun 2002 14:27:05 -0400
Update of /cvs-repository/Zope3/lib/python/Persistence/BTrees
In directory cvs.zope.org:/tmp/cvs-serv21810
Modified Files:
BTreeTemplate.c
Log Message:
BTree_grow(): semantically neutral edits, to reduce the differences
between the Zope2 and Zope3 versions.
=== Zope3/lib/python/Persistence/BTrees/BTreeTemplate.c 1.20 => 1.21 ===
{
int i;
- Sized *v, *e=0;
+ Sized *v, *e = 0;
BTreeItem *d;
if (self->len == self->size) {
@@ -226,7 +226,8 @@
return -1;
self->data = d;
self->size *= 2;
- } else {
+ }
+ else {
d = BTree_Malloc(sizeof(BTreeItem) * 2);
if (d == NULL)
return -1;
@@ -272,7 +273,8 @@
reason to INCREF!
*/
/* INCREF_KEY(self->data[1].key); */
- } else {
+ }
+ else {
COPY_KEY(d->key, BUCKET(e)->keys[0]);
INCREF_KEY(d->key);
}
@@ -281,7 +283,8 @@
if (self->len >= MAX_BTREE_SIZE(self) * 2)
return BTree_clone(self);
- } else {
+ }
+ else {
d->child = BTree_newBucket(self);
if (d->child == NULL)
return -1;
@@ -290,12 +293,6 @@
self->firstbucket = (Bucket *)d->child;
}
- /* refcnt note:
-
- It appears that d->child always has a refcnt of 2 in all paths,
- except possibly if BTree_split() is called.
- */
-
return 0;
}
@@ -564,7 +561,6 @@
Error:
status = -1;
goto _return;
-
}
/*