frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: remove unused path from the LoadModule API 

Similar to its little brother - LoadSubModule. Currently all call sites
provide NULL anyway ;-)

Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2016-04-17 21:07:28 +01:00 committed by Adam Jackson
parent ea483af99a
commit 2196bb5038
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Helper.c
View File

@ -1615,7 +1615,7 @@ xf86LoadOneModule(const char *name, void *opt)
return NULL; return NULL;
} }
mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin); mod = LoadModule(Name, NULL, NULL, opt, NULL, &errmaj, &errmin);
if (!mod) if (!mod)
LoaderErrorMsg(NULL, Name, errmaj, errmin); LoaderErrorMsg(NULL, Name, errmaj, errmin);
free(Name); free(Name);

2
hw/xfree86/common/xf86Init.c
View File

@ -1503,7 +1503,7 @@ xf86LoadModules(const char **list, void **optlist)
else else
opt = NULL; opt = NULL;
if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) { if (!LoadModule(name, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
LoaderErrorMsg(NULL, name, errmaj, errmin); LoaderErrorMsg(NULL, name, errmaj, errmin);
failed = TRUE; failed = TRUE;
} }

8
hw/xfree86/doc/ddxDesign.xml
View File

@ -5210,7 +5210,7 @@ XFree86 common layer.
<blockquote><para> <blockquote><para>
<programlisting> <programlisting>
pointer LoadModule(const char *module, const char *path, pointer LoadModule(const char *module,
const char **subdirlist, const char **patternlist, const char **subdirlist, const char **patternlist,
pointer options, const XF86ModReqInfo * modreq, pointer options, const XF86ModReqInfo * modreq,
int *errmaj, int *errmin); int *errmaj, int *errmin);
@ -5226,12 +5226,6 @@ XFree86 common layer.
This might change. The other parameters are: This might change. The other parameters are:
<variablelist> <variablelist>
<varlistentry>
<term><parameter>path</parameter></term>
<listitem><para>
An optional comma-separated list of module search paths.
When <constant>NULL</constant>, the default search path is used.
</para></listitem></varlistentry>
<varlistentry> <varlistentry>

2
hw/xfree86/loader/loaderProcs.h
View File

@ -74,7 +74,7 @@ void LoaderInit(void);
ModuleDescPtr LoadDriver(const char *, const char *, int, void *, int *, ModuleDescPtr LoadDriver(const char *, const char *, int, void *, int *,
int *); int *);
ModuleDescPtr LoadModule(const char *, const char *, const char **, ModuleDescPtr LoadModule(const char *, const char **,
const char **, void *, const XF86ModReqInfo *, const char **, void *, const XF86ModReqInfo *,
int *, int *); int *, int *);
ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent); ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);

7
hw/xfree86/loader/loadmod.c
View File

@ -751,7 +751,7 @@ LoadSubModule(void *_parent, const char *module,
return NULL; return NULL;
} }
submod = LoadModule(module, NULL, subdirlist, patternlist, options, submod = LoadModule(module, subdirlist, patternlist, options,
modreq, errmaj, errmin); modreq, errmaj, errmin);
if (submod && submod != (ModuleDescPtr) 1) { if (submod && submod != (ModuleDescPtr) 1) {
parent->child = AddSibling(parent->child, submod); parent->child = AddSibling(parent->child, submod);
@ -821,7 +821,6 @@ static const char *compiled_in_modules[] = {
* module The module name. Normally this is not a filename but the * module The module name. Normally this is not a filename but the
* module's "canonical name. A full pathname is, however, * module's "canonical name. A full pathname is, however,
* also accepted. * also accepted.
* path A comma separated list of module directories.
* subdirlist A NULL terminated list of subdirectories to search. When * subdirlist A NULL terminated list of subdirectories to search. When
* NULL, the default "stdSubdirs" list is used. The default * NULL, the default "stdSubdirs" list is used. The default
* list is also substituted for entries with value DEFAULT_LIST. * list is also substituted for entries with value DEFAULT_LIST.
@ -853,7 +852,7 @@ static const char *compiled_in_modules[] = {
* *
*/ */
ModuleDescPtr ModuleDescPtr
LoadModule(const char *module, const char *path, const char **subdirlist, LoadModule(const char *module, const char **subdirlist,
const char **patternlist, void *options, const char **patternlist, void *options,
const XF86ModReqInfo * modreq, int *errmaj, int *errmin) const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
{ {
@ -909,7 +908,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist,
goto LoadModule_fail; goto LoadModule_fail;
} }
pathlist = InitPathList(path); pathlist = InitPathList(NULL);
if (!pathlist) { if (!pathlist) {
/* This could be a malloc failure too */ /* This could be a malloc failure too */
if (errmaj) if (errmaj)