aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/loader/loadmod.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
commit4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch)
treec1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/hw/xfree86/loader/loadmod.c
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/hw/xfree86/loader/loadmod.c')
-rw-r--r--xorg-server/hw/xfree86/loader/loadmod.c39
1 files changed, 10 insertions, 29 deletions
diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 7f3bbe49c..22b540c5d 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -59,9 +59,7 @@
#include "misc.h"
#include "xf86.h"
#include "xf86Priv.h"
-#ifdef XINPUT
#include "xf86Xinput.h"
-#endif
#include "loader.h"
#include "xf86Optrec.h"
@@ -200,7 +198,6 @@ LoaderSetPath(const char *path)
/* Standard set of module subdirectories to search, in order of preference */
static const char *stdSubdirs[] = {
"",
- "fonts/",
"input/",
"drivers/",
"multimedia/",
@@ -850,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);
@@ -872,6 +862,15 @@ 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);
+ ret = (ModuleDescPtr) 1;
+ goto LoadModule_exit;
+ }
+
if (!name) {
if (errmaj)
*errmaj = LDR_BADUSAGE;
@@ -1136,24 +1135,6 @@ UnloadSubModule(ModuleDescPtr mod)
}
static void
-FreeModuleDesc(ModuleDescPtr head)
-{
- ModuleDescPtr sibs, prev;
-
- if (head == (ModuleDescPtr) 1)
- return;
- if (head->child)
- FreeModuleDesc(head->child);
- sibs = head;
- while (sibs) {
- prev = sibs;
- sibs = sibs->sib;
- TestFree(prev->name);
- xfree(prev);
- }
-}
-
-static void
RemoveChild(ModuleDescPtr child)
{
ModuleDescPtr mdp;