[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
libtool--gary--1.0--patch-29
From: |
Gary V. Vaughan |
Subject: |
libtool--gary--1.0--patch-29 |
Date: |
Fri, 9 Jul 2004 15:27:57 +0100 (BST) |
User-agent: |
mailnotify/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Okay to commit?
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)
iD8DBQFA7qttFRMICSmD1gYRAl0hAJ9qLfCXYgMUyNRP3bkeV54bVp8QqgCcCZRn
tK313J0mPYfEMytR806wm+E=
=DVaV
-----END PGP SIGNATURE-----
* looking for address@hidden/libtool--gary--1.0--patch-28 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-28
M ChangeLog
M libltdl/ltdl.c
M libltdl/ltdl.h
M libltdl/lt__private.h
M libltdl/loaders/loadlibrary.c
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
A cleaner way to access the private fields of an lt_dlhandle
than my move of the module field into lt_dlinfo:
* libltdl/ltdl.c (lt_caller_data, lt_dlhandle_struct): Move from
here...
* libltdl/lt__private.h (lt_caller_data, lt_dlhandle_struct):
...to here. And put the module field back here...
* libltdl/ltdl.h (lt_dlinfo): ...instead of here.
* libltdl/loaders/loadlibrary.c (vm_open): Adjust.
2004-07-09 Gary V. Vaughan <address@hidden>
--- orig/libltdl/loaders/loadlibrary.c
+++ mod/libltdl/loaders/loadlibrary.c
@@ -151,14 +151,13 @@
find one. */
while (cur = lt_dlhandle_next (cur))
{
- const lt_dlinfo *info = lt_dlgetinfo (cur);
- if (!info->module)
+ if (!cur->module)
{
cur = 0;
break;
}
- if (info->module == module)
+ if (cur->module == module)
{
break;
}
--- orig/libltdl/lt__private.h
+++ mod/libltdl/lt__private.h
@@ -88,6 +88,28 @@
+/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
+
+/* This type is used for the array of caller data sets in each handler. */
+typedef struct {
+ lt_dlcaller_id key;
+ void * data;
+} lt_caller_data;
+
+struct lt_dlhandle_struct {
+ struct lt_dlhandle_struct *next;
+ lt_dlloader *loader; /* dlopening interface */
+ lt_dlinfo info; /* user visible fields */
+ int depcount; /* number of dependencies */
+ lt_dlhandle *deplibs; /* dependencies */
+ lt_module module; /* system module handle */
+ void * system; /* system specific data */
+ lt_caller_data *caller_data; /* per caller associated data */
+ int flags; /* various boolean stats */
+};
+
+
+
/* --- ERROR HANDLING --- */
/* Extract the diagnostic strings from the error table macro in the same
--- orig/libltdl/ltdl.c
+++ mod/libltdl/ltdl.c
@@ -59,18 +59,6 @@
-/* --- TYPE DEFINITIONS -- */
-
-
-/* This type is used for the array of caller data sets in each handler. */
-typedef struct {
- lt_dlcaller_id key;
- void * data;
-} lt_caller_data;
-
-
-
-
/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
@@ -86,17 +74,6 @@
lt_user_data dlloader_data;
};
-struct lt_dlhandle_struct {
- struct lt_dlhandle_struct *next;
- lt_dlloader *loader; /* dlopening interface */
- lt_dlinfo info;
- int depcount; /* number of dependencies */
- lt_dlhandle *deplibs; /* dependencies */
- void * system; /* system specific data */
- lt_caller_data *caller_data; /* per caller associated data */
- int flags; /* various boolean stats */
-};
-
/* Various boolean flags can be stored in the flags field of an
lt_dlhandle_struct... */
#define LT_DLGET_FLAG(handle, flag) (((handle)->flags & (flag)) == (flag))
@@ -414,9 +391,9 @@
{
lt_user_data data = loader->dlloader_data;
- cur->info.module = loader->module_open (data, filename);
+ cur->module = loader->module_open (data, filename);
- if (cur->info.module != 0)
+ if (cur->module != 0)
{
break;
}
@@ -1724,7 +1701,7 @@
handles = handle->next;
}
- errors += handle->loader->module_close (data, handle->info.module);
+ errors += handle->loader->module_close (data, handle->module);
errors += unload_deplibs(handle);
/* It is up to the callers to free the data itself. */
@@ -1807,7 +1784,7 @@
strcat(sym, symbol);
/* try "modulename_LTX_symbol" */
- address = handle->loader->find_sym (data, handle->info.module, sym);
+ address = handle->loader->find_sym (data, handle->module, sym);
if (address)
{
if (sym != lsym)
@@ -1830,7 +1807,7 @@
strcpy(sym, symbol);
}
- address = handle->loader->find_sym (data, handle->info.module, sym);
+ address = handle->loader->find_sym (data, handle->module, sym);
if (sym != lsym)
{
FREE (sym);
--- orig/libltdl/ltdl.h
+++ mod/libltdl/ltdl.h
@@ -116,7 +116,6 @@
char * name; /* module name */
int ref_count; /* number of times lt_dlopened minus
number of times lt_dlclosed. */
- lt_module module; /* system module handle */
} lt_dlinfo;
LT_SCOPE const lt_dlinfo *lt_dlgetinfo (lt_dlhandle handle);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- libtool--gary--1.0--patch-29,
Gary V. Vaughan <=