summaryrefslogtreecommitdiffstats
path: root/Python/dynload_os2.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1999-12-22 14:09:35 (GMT)
committerGuido van Rossum <guido@python.org>1999-12-22 14:09:35 (GMT)
commit96a8fb7e99aa8d612473a1dd87e4c1deb8408898 (patch)
tree0fb56af511a85378667bf868ec96cc8335615dca /Python/dynload_os2.c
parent6a90b5e4d0503ce56217795ff7c35a901e4f85a2 (diff)
downloadcpython-96a8fb7e99aa8d612473a1dd87e4c1deb8408898.zip
cpython-96a8fb7e99aa8d612473a1dd87e4c1deb8408898.tar.gz
cpython-96a8fb7e99aa8d612473a1dd87e4c1deb8408898.tar.bz2
Cleanup patches from Greg Stein:
* in import.c, #ifdef out references to dynamic loading based on HAVE_DYNAMIC_LOADING * clean out the platform-specific crud from importdl.c. [ maybe fold this function into import.c and drop the importdl.c file? Greg.] * change GetDynLoadFunc's "funcname" parameter to "shortname". change "name" to "fqname" for clarification. * each GetDynLoadFunc now creates its own funcname value. WARNING: as I mentioned previously, we may run into an issue with a missing "_" on some platforms. Testing will show this pretty quickly, however. * move pathname munging into dynload_shlib.c
Diffstat (limited to 'Python/dynload_os2.c')
-rw-r--r--Python/dynload_os2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Python/dynload_os2.c b/Python/dynload_os2.c
index 6090c33..528e7dc 100644
--- a/Python/dynload_os2.c
+++ b/Python/dynload_os2.c
@@ -45,13 +45,14 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
{0, 0}
};
-dl_funcptr _PyImport_GetDynLoadFunc(const char *name, const char *funcname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
const char *pathname, FILE *fp)
{
dl_funcptr p;
APIRET rc;
HMODULE hDLL;
char failreason[256];
+ char funcname[258];
rc = DosLoadModule(failreason,
sizeof(failreason),
@@ -67,6 +68,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *name, const char *funcname,
return NULL;
}
+ sprintf(funcname, "init%.200s", shortname);
rc = DosQueryProcAddr(hDLL, 0L, funcname, &p);
if (rc != NO_ERROR)
p = NULL; /* Signify Failure to Acquire Entrypoint */