Always normalize the module name.
This commit is contained in:
parent
9a1c6afd12
commit
0a63d874e9
|
@ -2429,12 +2429,8 @@ xf86LoadOneModule(char *name, pointer opt)
|
||||||
if (!name)
|
if (!name)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
#ifndef NORMALISE_MODULE_NAME
|
|
||||||
Name = xstrdup(name);
|
|
||||||
#else
|
|
||||||
/* Normalise the module name */
|
/* Normalise the module name */
|
||||||
Name = xf86NormalizeName(name);
|
Name = xf86NormalizeName(name);
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Skip empty names */
|
/* Skip empty names */
|
||||||
if (Name == NULL)
|
if (Name == NULL)
|
||||||
|
|
|
@ -1769,12 +1769,8 @@ xf86LoadModules(char **list, pointer *optlist)
|
||||||
|
|
||||||
for (i = 0; list[i] != NULL; i++) {
|
for (i = 0; list[i] != NULL; i++) {
|
||||||
|
|
||||||
#ifndef NORMALISE_MODULE_NAME
|
|
||||||
name = xstrdup(list[i]);
|
|
||||||
#else
|
|
||||||
/* Normalise the module name */
|
/* Normalise the module name */
|
||||||
name = xf86NormalizeName(list[i]);
|
name = xf86NormalizeName(list[i]);
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Skip empty names */
|
/* Skip empty names */
|
||||||
if (name == NULL || *name == '\0')
|
if (name == NULL || *name == '\0')
|
||||||
|
|
Loading…
Reference in New Issue