diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-09-17 08:16:51 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2010-09-22 10:56:57 -0400 |
| commit | 09929da50503b559459f5b722c11647c47857fdb (patch) | |
| tree | 1d1bdde259da08a03b4fcd9f6da0ccf03a7a6376 | |
| parent | 3a26e7f459764d4aee71b2d7e25b113b729b94ac (diff) | |
loader: Remove unused canonical name field
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | hw/xfree86/loader/loader.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/loader/loader.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 580d05914..878cb398d 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -174,7 +174,7 @@ LoaderInit(void) path = uwcrtpath; /* fallback: try to get libcrt.a from the uccs */ else path = xcrtpath; /* get the libcrt.a we compiled with */ - LoaderOpen (path, "libcrt", 0, &errmaj, &errmin, &wasLoaded); + LoaderOpen (path, 0, &errmaj, &errmin, &wasLoaded); } #endif } @@ -203,7 +203,7 @@ do_dlopen(loaderPtr modrec, int flags) /* Public Interface to the loader. */ int -LoaderOpen(const char *module, const char *cname, int handle, +LoaderOpen(const char *module, int handle, int *errmaj, int *errmin, int *wasLoaded, int flags) { loaderPtr tmp; @@ -259,7 +259,6 @@ LoaderOpen(const char *module, const char *cname, int handle, tmp = _LoaderListPush(); tmp->name = strdup(module); - tmp->cname = strdup(cname); tmp->handle = new_handle; if ((tmp->private = do_dlopen(tmp, flags)) == NULL) { @@ -337,7 +336,6 @@ LoaderUnload(int handle) xf86Msg(X_INFO, "Unloading %s\n", tmp->name); dlclose(tmp->private); free(tmp->name); - free(tmp->cname); free(tmp); } diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h index 42e1518e6..9dfc30758 100644 --- a/hw/xfree86/loader/loader.h +++ b/hw/xfree86/loader/loader.h @@ -68,7 +68,6 @@ typedef struct _loader { int handle; /* Unique id used to remove symbols from * this module when it is unloaded */ char *name; - char *cname; void *private; /* format specific data */ loaderPtr next; } loaderRec; @@ -87,7 +86,7 @@ extern const ModuleVersions LoaderVersionInfo; extern unsigned long LoaderOptions; /* Internal Functions */ -int LoaderOpen(const char *, const char *, int, int *, int *, int *, int); +int LoaderOpen(const char *, int, int *, int *, int *, int); int LoaderHandleOpen(int); #endif /* _LOADER_H */ diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 615e8c691..a9d04b832 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -926,8 +926,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist, *errmin = 0; goto LoadModule_fail; } - ret->handle = LoaderOpen(found, name, 0, - errmaj, errmin, &wasLoaded, flags); + ret->handle = LoaderOpen(found, 0, errmaj, errmin, &wasLoaded, flags); if (ret->handle < 0) goto LoadModule_fail; |