diff options
| author | Giampaolo Rodola' <g.rodola@gmail.com> | 2012-12-17 20:46:29 +0100 |
|---|---|---|
| committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2012-12-17 20:46:29 +0100 |
| commit | 256a72f8e9db70a130289a61f3c42724b53a5c8c (patch) | |
| tree | 07cc937c010871cf2ab2e7254fa929febac8a20f /Python/dynload_next.c | |
| parent | 2f0e84852b01098904a180a66569a40ba93425d6 (diff) | |
| parent | 9d1c74a5371d09c4867cae87e762954fd4053092 (diff) | |
| download | cpython-256a72f8e9db70a130289a61f3c42724b53a5c8c.tar.gz | |
Issue 16646 (ftplib): deliberately use intermediate variable after catching exception
Diffstat (limited to 'Python/dynload_next.c')
| -rw-r--r-- | Python/dynload_next.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index cabf9b9663..85c95b41bb 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -8,11 +8,7 @@ #include <mach-o/dyld.h> -const struct filedescr _PyImport_DynLoadFiletab[] = { - {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, - {0, 0} -}; +const char *_PyImport_DynLoadFiletab[] = {".so", NULL}; /* ** Python modules are Mach-O MH_BUNDLE files. The best way to load these @@ -31,8 +27,8 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE #endif -dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, - const char *pathname, FILE *fp) +dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, + const char *pathname, FILE *fp) { dl_funcptr p = NULL; char funcname[258]; |