Issue python#3080: Remove unused argument of _PyImport_GetDynLoadFunc()

Victor Stinner · Victor Stinner · commit 42040fb66571 · 2011-02-22T23:16:19.000Z
The first argument, fqname, was not used.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ aix_loaderror(const char *pathname)`
`154`	`154`	`}`
`155`	`155`
`156`	`156`
`157`		`-dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,`
	`157`	`+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,`
`158`	`158`	`const char pathname, FILE fp)`
`159`	`159`	`{`
`160`	`160`	`dl_funcptr p;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {`
`16`	`16`	`};`
`17`	`17`
`18`	`18`
`19`		`-dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,`
	`19`	`+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,`
`20`	`20`	`const char pathname, FILE fp)`
`21`	`21`	`{`
`22`	`22`	`char funcname[258];`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {`
`19`	`19`	`{0, 0}`
`20`	`20`	`};`
`21`	`21`
`22`		`-dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,`
	`22`	`+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,`
`23`	`23`	`const char pathname, FILE fp)`
`24`	`24`	`{`
`25`	`25`	`dl_funcptr p;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {`
`15`	`15`	`{0, 0}`
`16`	`16`	`};`
`17`	`17`
`18`		`-dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,`
	`18`	`+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,`
`19`	`19`	`const char pathname, FILE fp)`
`20`	`20`	`{`
`21`	`21`	`dl_funcptr p;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ static struct {`
`75`	`75`	`static int nhandles = 0;`
`76`	`76`
`77`	`77`
`78`		`-dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,`
	`78`	`+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,`
`79`	`79`	`const char pathname, FILE fp)`
`80`	`80`	`{`
`81`	`81`	`dl_funcptr p;`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ static char *GetPythonImport (HINSTANCE hModule)`
`171`	`171`	`return NULL;`
`172`	`172`	`}`
`173`	`173`
`174`		`-dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,`
	`174`	`+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,`
`175`	`175`	`const char pathname, FILE fp)`
`176`	`176`	`{`
`177`	`177`	`dl_funcptr p;`