andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a useless open() of the module we're about to load.

Browse Source
This commit is contained in:
Adam Jackson 2006-07-21 22:55:41 -04:00
parent 985611d5cd
commit 114264584c
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/loader/dlloader.c
View File

@ -129,7 +129,7 @@ DLFindSymbol(const char *name)
}
void *
DLLoadModule(loaderPtr modrec, int fd, int flags)
DLLoadModule(loaderPtr modrec, int flags)
{
DLModulePtr dlfile;
DLModuleList *l;

2
hw/xfree86/loader/dlloader.h
View File

@ -26,7 +26,7 @@
#ifndef _DLLOADER_H
#define _DLLOADER_H
extern void *DLLoadModule(loaderPtr, int, int flags);
extern void *DLLoadModule(loaderPtr, int flags);
extern void DLUnloadModule(void *);
extern void *DLFindSymbol(const char *name);

15
hw/xfree86/loader/loader.c
View File

@ -313,7 +313,6 @@ LoaderOpen(const char *module, const char *cname, int handle,
{
loaderPtr tmp;
int new_handle;
int fd;
#if defined(DEBUG)
ErrorF("LoaderOpen(%s)\n", module);
@ -369,16 +368,6 @@ LoaderOpen(const char *module, const char *cname, int handle,
freeHandles[new_handle] = HANDLE_USED;
refCount[new_handle] = 1;
if ((fd = open(module, O_RDONLY)) < 0) {
xf86Msg(X_ERROR, "Unable to open %s\n", module);
freeHandles[new_handle] = HANDLE_FREE;
if (errmaj)
*errmaj = LDR_NOMODOPEN;
if (errmin)
*errmin = errno;
return -1;
}
tmp = _LoaderListPush();
tmp->name = malloc(strlen(module) + 1);
strcpy(tmp->name, module);
@ -387,7 +376,7 @@ LoaderOpen(const char *module, const char *cname, int handle,
tmp->handle = new_handle;
tmp->module = moduleseq++;
if ((tmp->private = DLLoadModule(tmp, fd, flags)) == NULL) {
if ((tmp->private = DLLoadModule(tmp, flags)) == NULL) {
xf86Msg(X_ERROR, "Failed to load %s\n", module);
_LoaderListPop(new_handle);
freeHandles[new_handle] = HANDLE_FREE;
@ -398,8 +387,6 @@ LoaderOpen(const char *module, const char *cname, int handle,
return -1;
}
close(fd);
return new_handle;
}