summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-07-26 16:35:19 +0200
committerAlan Hourihane <alanh@localhost.(none)>2008-08-12 19:33:31 +0100
commitfb807db7686c53ca8fc5513f83d67dddd05a1db0 (patch)
tree007210ebe4ba4a01e233abd32639f56ed5070ae3 /hw
parent917e94b38f984988d328e2cac3f8625c742fd78e (diff)
xfree86: don't output a spurious newline to the log when loading a module
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/loader/loadmod.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 6031db756..70c54a76a 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -847,14 +847,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
char *m = NULL;
const char **cim;
- xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"\n", 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;
- }
+ xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
patterns = InitPatterns(patternlist);
name = LoaderGetCanonicalName(module, patterns);
@@ -869,6 +862,14 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
xf86ErrorFVerb(3, "\n");
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 (errmaj)
*errmaj = LDR_BADUSAGE;