Skip to content

Z
ZEO
Commit fe9bccf8 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Undid a previous change, which broke all extensions that defined 

persistent base classes (e.g. BTrees.)

Also added error checking for code that performs initialization of
some global string objects.
parent ee71c2a9
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
src/Persistence/cPersistence.c
View file @ fe9bccf8
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.42 2001/03/28 00:34:34 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.43 2001/03/28 14:04:15 jim Exp $\n";
#include <string.h> #include <string.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -95,8 +95,6 @@ static char cPersistence_doc_string[] = ...@@ -95,8 +95,6 @@ static char cPersistence_doc_string[] =
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
#define OBJECT(V) ((PyObject*)(V)) #define OBJECT(V) ((PyObject*)(V))
static cPersistenceCAPIstruct *cPersistenceCAPI;
static PyObject *py_keys, *py_setstate, *py___dict__, *py_timeTime; static PyObject *py_keys, *py_setstate, *py___dict__, *py_timeTime;
static PyObject *py__p_changed, *py__p_deactivate; static PyObject *py__p_changed, *py__p_deactivate;
static PyObject *py___getattr__, *py___setattr__, *py___delattr__; static PyObject *py___getattr__, *py___setattr__, *py___delattr__;
...@@ -122,10 +120,10 @@ call_debug(char *event, cPersistentObject *self) ...@@ -122,10 +120,10 @@ call_debug(char *event, cPersistentObject *self)
} }
#endif #endif
static void static int
init_strings(void) init_strings(void)
{ {
#define INIT_STRING(S) py_ ## S = PyString_FromString(#S) #define INIT_STRING(S) if (! (py_ ## S = PyString_FromString(#S))) return -1;
INIT_STRING(keys); INIT_STRING(keys);
INIT_STRING(setstate); INIT_STRING(setstate);
INIT_STRING(timeTime); INIT_STRING(timeTime);
...@@ -136,6 +134,7 @@ init_strings(void) ...@@ -136,6 +134,7 @@ init_strings(void)
INIT_STRING(__setattr__); INIT_STRING(__setattr__);
INIT_STRING(__delattr__); INIT_STRING(__delattr__);
#undef INIT_STRING #undef INIT_STRING
return 0;
} }
static PyObject * static PyObject *
...@@ -740,7 +739,7 @@ void ...@@ -740,7 +739,7 @@ void
initcPersistence(void) initcPersistence(void)
{ {
PyObject *m, *d, *s; PyObject *m, *d, *s;
char *rev="$Revision: 1.42 $"; char *rev="$Revision: 1.43 $";
s = PyString_FromString("TimeStamp"); s = PyString_FromString("TimeStamp");
if (s == NULL) if (s == NULL)
...@@ -756,10 +755,11 @@ initcPersistence(void) ...@@ -756,10 +755,11 @@ initcPersistence(void)
Py_DECREF(s); Py_DECREF(s);
} }
if (init_strings() < 0) return;
m = Py_InitModule4("cPersistence", cP_methods, cPersistence_doc_string, m = Py_InitModule4("cPersistence", cP_methods, cPersistence_doc_string,
(PyObject*)NULL, PYTHON_API_VERSION); (PyObject*)NULL, PYTHON_API_VERSION);
init_strings();
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
PyDict_SetItemString(d,"__version__", PyDict_SetItemString(d,"__version__",
......
src/ZODB/cPersistence.c
View file @ fe9bccf8
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.42 2001/03/28 00:34:34 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.43 2001/03/28 14:04:15 jim Exp $\n";
#include <string.h> #include <string.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -95,8 +95,6 @@ static char cPersistence_doc_string[] = ...@@ -95,8 +95,6 @@ static char cPersistence_doc_string[] =
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
#define OBJECT(V) ((PyObject*)(V)) #define OBJECT(V) ((PyObject*)(V))
static cPersistenceCAPIstruct *cPersistenceCAPI;
static PyObject *py_keys, *py_setstate, *py___dict__, *py_timeTime; static PyObject *py_keys, *py_setstate, *py___dict__, *py_timeTime;
static PyObject *py__p_changed, *py__p_deactivate; static PyObject *py__p_changed, *py__p_deactivate;
static PyObject *py___getattr__, *py___setattr__, *py___delattr__; static PyObject *py___getattr__, *py___setattr__, *py___delattr__;
...@@ -122,10 +120,10 @@ call_debug(char *event, cPersistentObject *self) ...@@ -122,10 +120,10 @@ call_debug(char *event, cPersistentObject *self)
} }
#endif #endif
static void static int
init_strings(void) init_strings(void)
{ {
#define INIT_STRING(S) py_ ## S = PyString_FromString(#S) #define INIT_STRING(S) if (! (py_ ## S = PyString_FromString(#S))) return -1;
INIT_STRING(keys); INIT_STRING(keys);
INIT_STRING(setstate); INIT_STRING(setstate);
INIT_STRING(timeTime); INIT_STRING(timeTime);
...@@ -136,6 +134,7 @@ init_strings(void) ...@@ -136,6 +134,7 @@ init_strings(void)
INIT_STRING(__setattr__); INIT_STRING(__setattr__);
INIT_STRING(__delattr__); INIT_STRING(__delattr__);
#undef INIT_STRING #undef INIT_STRING
return 0;
} }
static PyObject * static PyObject *
...@@ -740,7 +739,7 @@ void ...@@ -740,7 +739,7 @@ void
initcPersistence(void) initcPersistence(void)
{ {
PyObject *m, *d, *s; PyObject *m, *d, *s;
char *rev="$Revision: 1.42 $"; char *rev="$Revision: 1.43 $";
s = PyString_FromString("TimeStamp"); s = PyString_FromString("TimeStamp");
if (s == NULL) if (s == NULL)
...@@ -756,10 +755,11 @@ initcPersistence(void) ...@@ -756,10 +755,11 @@ initcPersistence(void)
Py_DECREF(s); Py_DECREF(s);
} }
if (init_strings() < 0) return;
m = Py_InitModule4("cPersistence", cP_methods, cPersistence_doc_string, m = Py_InitModule4("cPersistence", cP_methods, cPersistence_doc_string,
(PyObject*)NULL, PYTHON_API_VERSION); (PyObject*)NULL, PYTHON_API_VERSION);
init_strings();
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
PyDict_SetItemString(d,"__version__", PyDict_SetItemString(d,"__version__",
......
src/persistent/cPersistence.c
View file @ fe9bccf8
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.42 2001/03/28 00:34:34 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.43 2001/03/28 14:04:15 jim Exp $\n";
#include <string.h> #include <string.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -95,8 +95,6 @@ static char cPersistence_doc_string[] = ...@@ -95,8 +95,6 @@ static char cPersistence_doc_string[] =
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
#define OBJECT(V) ((PyObject*)(V)) #define OBJECT(V) ((PyObject*)(V))
static cPersistenceCAPIstruct *cPersistenceCAPI;
static PyObject *py_keys, *py_setstate, *py___dict__, *py_timeTime; static PyObject *py_keys, *py_setstate, *py___dict__, *py_timeTime;
static PyObject *py__p_changed, *py__p_deactivate; static PyObject *py__p_changed, *py__p_deactivate;
static PyObject *py___getattr__, *py___setattr__, *py___delattr__; static PyObject *py___getattr__, *py___setattr__, *py___delattr__;
...@@ -122,10 +120,10 @@ call_debug(char *event, cPersistentObject *self) ...@@ -122,10 +120,10 @@ call_debug(char *event, cPersistentObject *self)
} }
#endif #endif
static void static int
init_strings(void) init_strings(void)
{ {
#define INIT_STRING(S) py_ ## S = PyString_FromString(#S) #define INIT_STRING(S) if (! (py_ ## S = PyString_FromString(#S))) return -1;
INIT_STRING(keys); INIT_STRING(keys);
INIT_STRING(setstate); INIT_STRING(setstate);
INIT_STRING(timeTime); INIT_STRING(timeTime);
...@@ -136,6 +134,7 @@ init_strings(void) ...@@ -136,6 +134,7 @@ init_strings(void)
INIT_STRING(__setattr__); INIT_STRING(__setattr__);
INIT_STRING(__delattr__); INIT_STRING(__delattr__);
#undef INIT_STRING #undef INIT_STRING
return 0;
} }
static PyObject * static PyObject *
...@@ -740,7 +739,7 @@ void ...@@ -740,7 +739,7 @@ void
initcPersistence(void) initcPersistence(void)
{ {
PyObject *m, *d, *s; PyObject *m, *d, *s;
char *rev="$Revision: 1.42 $"; char *rev="$Revision: 1.43 $";
s = PyString_FromString("TimeStamp"); s = PyString_FromString("TimeStamp");
if (s == NULL) if (s == NULL)
...@@ -756,10 +755,11 @@ initcPersistence(void) ...@@ -756,10 +755,11 @@ initcPersistence(void)
Py_DECREF(s); Py_DECREF(s);
} }
if (init_strings() < 0) return;
m = Py_InitModule4("cPersistence", cP_methods, cPersistence_doc_string, m = Py_InitModule4("cPersistence", cP_methods, cPersistence_doc_string,
(PyObject*)NULL, PYTHON_API_VERSION); (PyObject*)NULL, PYTHON_API_VERSION);
init_strings();
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
PyDict_SetItemString(d,"__version__", PyDict_SetItemString(d,"__version__",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7