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:
parent
ea483af99a
commit
2196bb5038
|
@ -1615,7 +1615,7 @@ xf86LoadOneModule(const char *name, void *opt)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);
|
||||
mod = LoadModule(Name, NULL, NULL, opt, NULL, &errmaj, &errmin);
|
||||
if (!mod)
|
||||
LoaderErrorMsg(NULL, Name, errmaj, errmin);
|
||||
free(Name);
|
||||
|
|
|
@ -1503,7 +1503,7 @@ xf86LoadModules(const char **list, void **optlist)
|
|||
else
|
||||
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);
|
||||
failed = TRUE;
|
||||
}
|
||||
|
|
|
@ -5210,7 +5210,7 @@ XFree86 common layer.
|
|||
|
||||
<blockquote><para>
|
||||
<programlisting>
|
||||
pointer LoadModule(const char *module, const char *path,
|
||||
pointer LoadModule(const char *module,
|
||||
const char **subdirlist, const char **patternlist,
|
||||
pointer options, const XF86ModReqInfo * modreq,
|
||||
int *errmaj, int *errmin);
|
||||
|
@ -5226,12 +5226,6 @@ XFree86 common layer.
|
|||
This might change. The other parameters are:
|
||||
|
||||
<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>
|
||||
|
|
|
@ -74,7 +74,7 @@ void LoaderInit(void);
|
|||
|
||||
ModuleDescPtr LoadDriver(const char *, const char *, int, void *, int *,
|
||||
int *);
|
||||
ModuleDescPtr LoadModule(const char *, const char *, const char **,
|
||||
ModuleDescPtr LoadModule(const char *, const char **,
|
||||
const char **, void *, const XF86ModReqInfo *,
|
||||
int *, int *);
|
||||
ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
|
||||
|
|
|
@ -751,7 +751,7 @@ LoadSubModule(void *_parent, const char *module,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
submod = LoadModule(module, NULL, subdirlist, patternlist, options,
|
||||
submod = LoadModule(module, subdirlist, patternlist, options,
|
||||
modreq, errmaj, errmin);
|
||||
if (submod && submod != (ModuleDescPtr) 1) {
|
||||
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's "canonical name. A full pathname is, however,
|
||||
* also accepted.
|
||||
* path A comma separated list of module directories.
|
||||
* subdirlist A NULL terminated list of subdirectories to search. When
|
||||
* NULL, the default "stdSubdirs" list is used. The default
|
||||
* list is also substituted for entries with value DEFAULT_LIST.
|
||||
|
@ -853,7 +852,7 @@ static const char *compiled_in_modules[] = {
|
|||
*
|
||||
*/
|
||||
ModuleDescPtr
|
||||
LoadModule(const char *module, const char *path, const char **subdirlist,
|
||||
LoadModule(const char *module, const char **subdirlist,
|
||||
const char **patternlist, void *options,
|
||||
const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
|
||||
{
|
||||
|
@ -909,7 +908,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist,
|
|||
goto LoadModule_fail;
|
||||
}
|
||||
|
||||
pathlist = InitPathList(path);
|
||||
pathlist = InitPathList(NULL);
|
||||
if (!pathlist) {
|
||||
/* This could be a malloc failure too */
|
||||
if (errmaj)
|
||||
|
|
Loading…
Reference in New Issue