traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Instead of using _PyImport_Inittab[] directly, use the new "official" 

pointer *PyImport_Inittab which is initialized to _PyImport_Inittab.
This commit is contained in:
Guido van Rossum 1997-10-31 18:37:24 +00:00
parent 66959aff68
commit 771c6c8f7a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/import.c
View File

@ -80,6 +80,10 @@ extern long PyOS_GetLastModificationTime(); /* In getmtime.c */
/* See _PyImport_FixupExtension() below */
static PyObject *extensions = NULL;
/* This table is defined in config.c: */
extern struct _inittab _PyImport_Inittab[];
struct _inittab *PyImport_Inittab = _PyImport_Inittab;
/* Initialize things */
@ -612,9 +616,9 @@ is_builtin(name)
char *name;
{
int i;
for (i = 0; _PyImport_Inittab[i].name != NULL; i++) {
if (strcmp(name, _PyImport_Inittab[i].name) == 0) {
if (_PyImport_Inittab[i].initfunc == NULL)
for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
if (strcmp(name, PyImport_Inittab[i].name) == 0) {
if (PyImport_Inittab[i].initfunc == NULL)
return -1;
else
return 1;
@ -871,7 +875,7 @@ init_builtin(name)
if ((mod = _PyImport_FindExtension(name, name)) != NULL)
return 1;
for (p = _PyImport_Inittab; p->name != NULL; p++) {
for (p = PyImport_Inittab; p->name != NULL; p++) {
if (strcmp(name, p->name) == 0) {
if (p->initfunc == NULL) {
PyErr_Format(PyExc_ImportError,