From 8a62ac149122bc5211b2a128f80766dc42352187 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 2 Apr 2002 14:35:36 +0000
Subject: [PATCH] Jeremy, did you actually try to compile this? If so, what
compiler did you use?
---
src/Persistence/cPickleCache.c | 8 ++++----
src/ZODB/cPickleCache.c | 8 ++++----
src/persistent/cPickleCache.c | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Persistence/cPickleCache.c b/src/Persistence/cPickleCache.c
index 1d5ca48a..db0f3260 100644
--- a/src/Persistence/cPickleCache.c
+++ b/src/Persistence/cPickleCache.c
@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n"
"\n"
-"$Id: cPickleCache.c,v 1.46 2002/04/02 11:11:45 htrd Exp $\n";
+"$Id: cPickleCache.c,v 1.47 2002/04/02 14:35:36 gvanrossum Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E))
@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
{
int result;
PyExtensionClass *class;
+ PyObject *oid, *object_again;
+ cPersistentObject *p;
if (!PyExtensionInstance_Check(v)) {
PyErr_SetString(PyExc_ValueError,
@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
}
/* XXX Why not self->oid? */
- PyObject *oid = PyObject_GetAttr(v, py__p_oid);
- PyObject *object_again;
- cPersistentObject *p;
+ oid = PyObject_GetAttr(v, py__p_oid);
if (oid == NULL)
return -1;
diff --git a/src/ZODB/cPickleCache.c b/src/ZODB/cPickleCache.c
index 1d5ca48a..db0f3260 100644
--- a/src/ZODB/cPickleCache.c
+++ b/src/ZODB/cPickleCache.c
@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n"
"\n"
-"$Id: cPickleCache.c,v 1.46 2002/04/02 11:11:45 htrd Exp $\n";
+"$Id: cPickleCache.c,v 1.47 2002/04/02 14:35:36 gvanrossum Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E))
@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
{
int result;
PyExtensionClass *class;
+ PyObject *oid, *object_again;
+ cPersistentObject *p;
if (!PyExtensionInstance_Check(v)) {
PyErr_SetString(PyExc_ValueError,
@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
}
/* XXX Why not self->oid? */
- PyObject *oid = PyObject_GetAttr(v, py__p_oid);
- PyObject *object_again;
- cPersistentObject *p;
+ oid = PyObject_GetAttr(v, py__p_oid);
if (oid == NULL)
return -1;
diff --git a/src/persistent/cPickleCache.c b/src/persistent/cPickleCache.c
index 1d5ca48a..db0f3260 100644
--- a/src/persistent/cPickleCache.c
+++ b/src/persistent/cPickleCache.c
@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n"
"\n"
-"$Id: cPickleCache.c,v 1.46 2002/04/02 11:11:45 htrd Exp $\n";
+"$Id: cPickleCache.c,v 1.47 2002/04/02 14:35:36 gvanrossum Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E))
@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
{
int result;
PyExtensionClass *class;
+ PyObject *oid, *object_again;
+ cPersistentObject *p;
if (!PyExtensionInstance_Check(v)) {
PyErr_SetString(PyExc_ValueError,
@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
}
/* XXX Why not self->oid? */
- PyObject *oid = PyObject_GetAttr(v, py__p_oid);
- PyObject *object_again;
- cPersistentObject *p;
+ oid = PyObject_GetAttr(v, py__p_oid);
if (oid == NULL)
return -1;
--
GitLab