xfree86: don't output a spurious newline to the log when loading a module
This commit is contained in:
parent
2eaed4a10f
commit
e39a16aa58
|
@ -847,14 +847,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
|
||||||
char *m = NULL;
|
char *m = NULL;
|
||||||
const char **cim;
|
const char **cim;
|
||||||
|
|
||||||
xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"\n", module);
|
xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
|
||||||
|
|
||||||
for (cim = compiled_in_modules; *cim; cim++)
|
|
||||||
if (!strcmp (module, *cim))
|
|
||||||
{
|
|
||||||
xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", module);
|
|
||||||
return (ModuleDescPtr) 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
patterns = InitPatterns(patternlist);
|
patterns = InitPatterns(patternlist);
|
||||||
name = LoaderGetCanonicalName(module, patterns);
|
name = LoaderGetCanonicalName(module, patterns);
|
||||||
|
@ -869,6 +862,14 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
|
||||||
xf86ErrorFVerb(3, "\n");
|
xf86ErrorFVerb(3, "\n");
|
||||||
m = (char *)module;
|
m = (char *)module;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (cim = compiled_in_modules; *cim; cim++)
|
||||||
|
if (!strcmp (m, *cim))
|
||||||
|
{
|
||||||
|
xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
|
||||||
|
return (ModuleDescPtr) 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (!name) {
|
if (!name) {
|
||||||
if (errmaj)
|
if (errmaj)
|
||||||
*errmaj = LDR_BADUSAGE;
|
*errmaj = LDR_BADUSAGE;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user