Issue #3080: Remove unused argument of _PyImport_GetDynLoadFunc()

The first argument, fqname, was not used.

diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c
index 149990d799507f99a65663947b013abf3183e163..74c7b3260314139cefec2d533a00d3ffa8951cf4 100644 (file)
--- a/Python/dynload_aix.c
+++ b/Python/dynload_aix.c
@@ -154,7 +154,7 @@ aix_loaderror(const char *pathname)
 }
 
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                     const char *pathname, FILE *fp)
 {
     dl_funcptr p;

diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
index 2606e1e32fd5148148aca8661003f6916859cb8a..dc00ec560905820532ee47c3ab57e095dcdf8a03 100644 (file)
--- a/Python/dynload_dl.c
+++ b/Python/dynload_dl.c
@@ -16,7 +16,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
 };
 
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                    const char *pathname, FILE *fp)
 {
        char funcname[258];

diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c
index 18a81377f24bd218716da21f724567705b03f676..3ebbbad01f13dd2301226a0dfbe17b515d8f219e 100644 (file)
--- a/Python/dynload_hpux.c
+++ b/Python/dynload_hpux.c
@@ -19,7 +19,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
     {0, 0}
 };
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                     const char *pathname, FILE *fp)
 {
     dl_funcptr p;

diff --git a/Python/dynload_next.c b/Python/dynload_next.c
index cabf9b96637c7769f056e5096e394e6b6261b52f..eb17950b4578841b48fd11fd4d98ca3ddeb353a2 100644 (file)
--- a/Python/dynload_next.c
+++ b/Python/dynload_next.c
@@ -31,8 +31,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];

diff --git a/Python/dynload_os2.c b/Python/dynload_os2.c
index 101c024bbe44c1f89814565c1c9aa84645471d1c..f7264da04ce6dc2842ee7590bb48bd966dde3433 100644 (file)
--- a/Python/dynload_os2.c
+++ b/Python/dynload_os2.c
@@ -15,7 +15,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
     {0, 0}
 };
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                     const char *pathname, FILE *fp)
 {
     dl_funcptr p;

diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 7ea510e862dfabd2834779f1d2338f61b903ef72..1c215c329cb5cd242d6d018b08ded193cbd3634b 100644 (file)
--- a/Python/dynload_shlib.c
+++ b/Python/dynload_shlib.c
@@ -75,7 +75,7 @@ static struct {
 static int nhandles = 0;
 
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                     const char *pathname, FILE *fp)
 {
     dl_funcptr p;

diff --git a/Python/dynload_win.c b/Python/dynload_win.c
index 73a1dcf897f723941edc4e109f329d0443398972..9c04250f332e81bdd97b413bdee27cfa6841e38e 100644 (file)
--- a/Python/dynload_win.c
+++ b/Python/dynload_win.c
@@ -171,7 +171,7 @@ static char *GetPythonImport (HINSTANCE hModule)
     return NULL;
 }
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                     const char *pathname, FILE *fp)
 {
     dl_funcptr p;

diff --git a/Python/importdl.c b/Python/importdl.c
index 9caed453aaaaf51ff676ff287a282269f2b55819..74ca8a7cca190bf67a5e15f8c417a92338822019 100644 (file)
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -12,8 +12,7 @@
 
 #include "importdl.h"
 
-extern dl_funcptr _PyImport_GetDynLoadFunc(const char *name,
-                                           const char *shortname,
+extern dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
                                            const char *pathname, FILE *fp);
 
 
@@ -48,7 +47,7 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
         shortname = lastdot+1;
     }
 
-    p0 = _PyImport_GetDynLoadFunc(name, shortname, pathname, fp);
+    p0 = _PyImport_GetDynLoadFunc(shortname, pathname, fp);
     p = (PyObject*(*)(void))p0;
     if (PyErr_Occurred())
         goto error;