[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
libtool--gary--1.0--patch-28
From: |
Gary V. Vaughan |
Subject: |
libtool--gary--1.0--patch-28 |
Date: |
Fri, 9 Jul 2004 14:43:16 +0100 (BST) |
User-agent: |
mailnotify/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I've decided to break out some of the underlying bits of my
next big patch.
Okay to commit?
Cheers,
Gary.
- --
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)
iD8DBQFA7qD0FRMICSmD1gYRAhVtAJsFKbLRaG8FmIsIq62ktfpmXiPlnwCeLMd8
S5meLAavrq6OQ34eCgXZk+E=
=HPgG
-----END PGP SIGNATURE-----
* looking for address@hidden/libtool--gary--1.0--patch-27 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-27
M ChangeLog
M libltdl/ltdl.c
M libltdl/lt__private.h
M libltdl/loaders/dyld.c
M libltdl/loaders/preopen.c
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
* libltdl/lt__private.h (streq, strneq): New macros to make strcmp
calls as used for simple comparison easier to read.
* libltdl/loaders/dyld.c, libltdl/loaders/preopen.c,
libltdl/ltdl.c: Use them!
--- orig/libltdl/loaders/dyld.c
+++ mod/libltdl/loaders/dyld.c
@@ -390,7 +390,7 @@
while (i > 0)
{
--i;
- if (strcmp (_dyld_get_image_name (i), modname) != 0)
+ if (strneq (_dyld_get_image_name (i), modname))
{
mh = _dyld_get_image_header (i);
break;
@@ -439,7 +439,7 @@
--i;
id = lt__header_get_instnam (_dyld_get_image_header (i));
- if (id && (strcmp (id, name) != 0))
+ if (id && strneq (id, name))
{
mh = _dyld_get_image_header (i);
break;
--- orig/libltdl/loaders/preopen.c
+++ mod/libltdl/loaders/preopen.c
@@ -161,7 +161,7 @@
const lt_dlsymbol *symbol;
for (symbol= lists->symlist->symbols; symbol->name; ++symbol)
{
- if (!symbol->address && strcmp(symbol->name, filename) == 0)
+ if (!symbol->address && streq (symbol->name, filename))
{
module = (lt_module) lists->symlist;
goto done;
@@ -199,7 +199,7 @@
while (symbol->name)
{
- if (strcmp (symbol->name, name) == 0)
+ if (streq (symbol->name, name))
{
return symbol->address;
}
@@ -320,7 +320,7 @@
for (list = preloaded_symlists; list; list = list->next)
{
/* ...that was preloaded by the requesting ORIGINATOR... */
- if (strcmp (list->symlist->originator, originator) == 0)
+ if (streq (list->symlist->originator, originator))
{
const lt_dlsymbol *symbol;
unsigned int idx = 0;
@@ -331,7 +331,7 @@
while ((symbol = &list->symlist->symbols[idx++])->name != 0)
{
if ((symbol->address == 0)
- && (strcmp (symbol->name, "@PROGRAM@") != 0))
+ && (strneq (symbol->name, "@PROGRAM@")))
{
lt_dlhandle handle = lt_dlopen (symbol->name);
if (handle == 0)
--- orig/libltdl/lt__private.h
+++ mod/libltdl/lt__private.h
@@ -82,6 +82,12 @@
void lt__alloc_die_callback (void);
+/* For readability: */
+#define strneq(s1, s2) (strcmp((s1), (s2)) != 0)
+#define streq(s1, s2) (!strcmp((s1), (s2)))
+
+
+
/* --- ERROR HANDLING --- */
/* Extract the diagnostic strings from the error table macro in the same
--- orig/libltdl/ltdl.c
+++ mod/libltdl/ltdl.c
@@ -368,7 +368,7 @@
}
if (cur->info.filename && filename
- && strcmp (cur->info.filename, filename) == 0)
+ && streq (cur->info.filename, filename))
{
break;
}
@@ -1062,7 +1062,7 @@
}
/* Check whether we are opening a libtool module (.la extension). */
- if (ext && strcmp (ext, archive_ext) == 0)
+ if (ext && streq (ext, archive_ext))
{
/* this seems to be a libtool module */
FILE * file = 0;
@@ -1195,11 +1195,11 @@
{
errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
}
- else if (strcmp (line, "installed=yes\n") == 0)
+ else if (streq (line, "installed=yes\n"))
{
installed = 1;
}
- else if (strcmp (line, "installed=no\n") == 0)
+ else if (streq (line, "installed=no\n"))
{
installed = 0;
}
@@ -1398,9 +1398,9 @@
/* If FILENAME already bears a suitable extension, there is no need
to try appending additional extensions. */
- if (ext && ((strcmp (ext, archive_ext) == 0)
+ if (ext && ((streq (ext, archive_ext))
#if defined(LTDL_SHLIB_EXT)
- || (strcmp (ext, shlib_ext) == 0)
+ || (streq (ext, shlib_ext))
#endif
))
{
@@ -2050,7 +2050,7 @@
{
do
{
- if (cur->info.name && strcmp (cur->info.name, module_name) == 0)
+ if (cur->info.name && streq (cur->info.name, module_name))
break;
}
while ((cur = cur->next));
@@ -2250,7 +2250,7 @@
lt_dlloader *prev;
for (prev = loaders; prev->next; prev = prev->next)
{
- if (!strcmp (prev->next->loader_name, loader_name))
+ if (streq (prev->next->loader_name, loader_name))
{
break;
}
@@ -2317,7 +2317,7 @@
for (place = loaders; place; place = place->next)
{
- if (strcmp (place->loader_name, loader_name) == 0)
+ if (streq (place->loader_name, loader_name))
{
break;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- libtool--gary--1.0--patch-28,
Gary V. Vaughan <=