Commit 30466474 authored by Victor Stinner's avatar Victor Stinner

Issue #3080: Remove unused argument of _PyImport_GetDynLoadFunc()

The first argument, fqname, was not used.
parent b5162583
...@@ -154,7 +154,7 @@ aix_loaderror(const char *pathname) ...@@ -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) const char *pathname, FILE *fp)
{ {
dl_funcptr p; dl_funcptr p;
......
...@@ -16,7 +16,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { ...@@ -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) const char *pathname, FILE *fp)
{ {
char funcname[258]; char funcname[258];
......
...@@ -19,7 +19,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { ...@@ -19,7 +19,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
{0, 0} {0, 0}
}; };
dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
const char *pathname, FILE *fp) const char *pathname, FILE *fp)
{ {
dl_funcptr p; dl_funcptr p;
......
...@@ -31,8 +31,8 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { ...@@ -31,8 +31,8 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
#define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \
NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE
#endif #endif
dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
const char *pathname, FILE *fp) const char *pathname, FILE *fp)
{ {
dl_funcptr p = NULL; dl_funcptr p = NULL;
char funcname[258]; char funcname[258];
......
...@@ -15,7 +15,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { ...@@ -15,7 +15,7 @@ const struct filedescr _PyImport_DynLoadFiletab[] = {
{0, 0} {0, 0}
}; };
dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
const char *pathname, FILE *fp) const char *pathname, FILE *fp)
{ {
dl_funcptr p; dl_funcptr p;
......
...@@ -75,7 +75,7 @@ static struct { ...@@ -75,7 +75,7 @@ static struct {
static int nhandles = 0; 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) const char *pathname, FILE *fp)
{ {
dl_funcptr p; dl_funcptr p;
......
...@@ -171,7 +171,7 @@ static char *GetPythonImport (HINSTANCE hModule) ...@@ -171,7 +171,7 @@ static char *GetPythonImport (HINSTANCE hModule)
return NULL; return NULL;
} }
dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
const char *pathname, FILE *fp) const char *pathname, FILE *fp)
{ {
dl_funcptr p; dl_funcptr p;
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
#include "importdl.h" #include "importdl.h"
extern dl_funcptr _PyImport_GetDynLoadFunc(const char *name, extern dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
const char *shortname,
const char *pathname, FILE *fp); const char *pathname, FILE *fp);
...@@ -48,7 +47,7 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp) ...@@ -48,7 +47,7 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
shortname = lastdot+1; shortname = lastdot+1;
} }
p0 = _PyImport_GetDynLoadFunc(name, shortname, pathname, fp); p0 = _PyImport_GetDynLoadFunc(shortname, pathname, fp);
p = (PyObject*(*)(void))p0; p = (PyObject*(*)(void))p0;
if (PyErr_Occurred()) if (PyErr_Occurred())
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment