From 42040fb66571cbd3929f3141d6841d2e4fe047a0 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 22 Feb 2011 23:16:19 +0000
Subject: Issue #3080: Remove unused argument of _PyImport_GetDynLoadFunc()

The first argument, fqname, was not used.
---
 Python/dynload_aix.c   | 2 +-
 Python/dynload_dl.c    | 2 +-
 Python/dynload_hpux.c  | 2 +-
 Python/dynload_next.c  | 4 ++--
 Python/dynload_os2.c   | 2 +-
 Python/dynload_shlib.c | 2 +-
 Python/dynload_win.c   | 2 +-
 Python/importdl.c      | 5 ++---
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c
index 149990d..74c7b32 100644
--- 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 2606e1e..dc00ec5 100644
--- 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 18a8137..3ebbbad 100644
--- 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 cabf9b9..eb17950 100644
--- 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 101c024..f7264da 100644
--- 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 7ea510e..1c215c3 100644
--- 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 73a1dcf..9c04250 100644
--- 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 9caed45..74ca8a7 100644
--- 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;
-- 
cgit v0.12