[Python-Dev] r88516 - in python/branches/py3k/Python: dynload_aix.c dynload_dl.c dynload_hpux.c dynload_next.c dynload_os2.c dynload_shlib.c dynload_win.c importdl.c

[Georg Brandl]

This commit introduced tabs, at least in dynload_dl.c.

Georg

On 23.02.2011 00:16, victor.stinner wrote:
> Author: victor.stinner
> Date: Wed Feb 23 00:16:19 2011
> New Revision: 88516
> 
> Log:
> Issue #3080: Remove unused argument of _PyImport_GetDynLoadFunc()
> 
> The first argument, fqname, was not used.
> 
> Modified:
>    python/branches/py3k/Python/dynload_aix.c
>    python/branches/py3k/Python/dynload_dl.c
>    python/branches/py3k/Python/dynload_hpux.c
>    python/branches/py3k/Python/dynload_next.c
>    python/branches/py3k/Python/dynload_os2.c
>    python/branches/py3k/Python/dynload_shlib.c
>    python/branches/py3k/Python/dynload_win.c
>    python/branches/py3k/Python/importdl.c
> 
> Modified: python/branches/py3k/Python/dynload_aix.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_aix.c	(original)
> +++ python/branches/py3k/Python/dynload_aix.c	Wed Feb 23 00:16:19 2011
> @@ -154,7 +154,7 @@
>  }
>  
>  
> -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;
> 
> Modified: python/branches/py3k/Python/dynload_dl.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_dl.c	(original)
> +++ python/branches/py3k/Python/dynload_dl.c	Wed Feb 23 00:16:19 2011
> @@ -16,7 +16,7 @@
>  };
>  
>  
> -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];
> 
> Modified: python/branches/py3k/Python/dynload_hpux.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_hpux.c	(original)
> +++ python/branches/py3k/Python/dynload_hpux.c	Wed Feb 23 00:16:19 2011
> @@ -19,7 +19,7 @@
>      {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;
> 
> Modified: python/branches/py3k/Python/dynload_next.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_next.c	(original)
> +++ python/branches/py3k/Python/dynload_next.c	Wed Feb 23 00:16:19 2011
> @@ -31,8 +31,8 @@
>  #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];
> 
> Modified: python/branches/py3k/Python/dynload_os2.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_os2.c	(original)
> +++ python/branches/py3k/Python/dynload_os2.c	Wed Feb 23 00:16:19 2011
> @@ -15,7 +15,7 @@
>      {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;
> 
> Modified: python/branches/py3k/Python/dynload_shlib.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_shlib.c	(original)
> +++ python/branches/py3k/Python/dynload_shlib.c	Wed Feb 23 00:16:19 2011
> @@ -75,7 +75,7 @@
>  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;
> 
> Modified: python/branches/py3k/Python/dynload_win.c
> ==============================================================================
> --- python/branches/py3k/Python/dynload_win.c	(original)
> +++ python/branches/py3k/Python/dynload_win.c	Wed Feb 23 00:16:19 2011
> @@ -171,7 +171,7 @@
>      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;
> 
> Modified: python/branches/py3k/Python/importdl.c
> ==============================================================================
> --- python/branches/py3k/Python/importdl.c	(original)
> +++ python/branches/py3k/Python/importdl.c	Wed Feb 23 00:16:19 2011
> @@ -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 @@
>          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;