[PATCH 3/8] loader: Remove unused canonical name field

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/loader/loader.c  |    6 ++----
 hw/xfree86/loader/loader.h  |    3 +--
 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 580d059..878cb39 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 42e1518..9dfc307 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 615e8c6..a9d04b8 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;
 
-- 
1.7.2.2