FYI: libtool--devo--1.0--patch-150

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.
- -- 
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)

iD8DBQFBNYkoFRMICSmD1gYRAg3AAKC9aiivqaXqkp6jiw7TwKivaqfkHACgrsqR
PCMrIFMcaMi+dkx6/yz605s=
=SY1T
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--devo--1.0--patch-149 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-149
M  ChangeLog
M  libltdl/ltdl.c

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>
        * libltdl/ltdl.c (lt_dlexit, tryall_dlopen): Fix gcc parentheses
        warning.
        (foreach_dirinpath, try_dlopen, lt_dlpath_insertdir): Fix gcc
        signed vs unsigned warning.
        Reported by Bob Friesenhahn <address@hidden>

--- orig/libltdl/ltdl.c
+++ mod/libltdl/ltdl.c
@@ -288,7 +288,7 @@
        }
 
       /* close all loaders */
-      while (loader = lt_dlloader_next (loader))
+      while ((loader = lt_dlloader_next (loader)))
        {
          lt_dlvtable *vtable = (lt_dlvtable *) lt_dlloader_get (loader);
 
@@ -365,7 +365,7 @@
     const lt_dlvtable *vtable = 0;
     lt_dlloader *loader = 0;
 
-    while (loader = lt_dlloader_next (loader))
+    while ((loader = lt_dlloader_next (loader)))
       {
        vtable = lt_dlloader_get (loader);
        handle->module = vtable->module_open (vtable->dlloader_data, filename);
@@ -580,7 +580,7 @@
                   foreach_callback_func *func, void *data1, void *data2)
 {
   int   result         = 0;
-  int   filenamesize   = 0;
+  size_t filenamesize  = 0;
   size_t lenbase       = LT_STRLEN (base_name);
   size_t argz_len      = 0;
   char *argz           = 0;
@@ -605,10 +605,10 @@
       {
        size_t lendir = LT_STRLEN (dir_name);
 
-       if (lendir +1 +lenbase >= filenamesize)
+       if (1+ lendir + lenbase >= filenamesize)
        {
          FREE (filename);
-         filenamesize  = lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
+         filenamesize  = 1+ lendir + 1+ lenbase; /* "/d" + '/' + "f" + '\0' */
          filename      = MALLOC (char, filenamesize);
          if (!filename)
            goto cleanup;
@@ -993,30 +993,30 @@
 
   ext = strrchr (base_name, '.');
 
-      /* extract the module name from the file name */
-      name = MALLOC (char, ext - base_name + 1);
-      if (!name)
-       {
-         ++errors;
-         goto cleanup;
-       }
+  /* extract the module name from the file name */
+  name = MALLOC (char, ext - base_name + 1);
+  if (!name)
+    {
+      ++errors;
+      goto cleanup;
+    }
 
-      /* canonicalize the module name */
+  /* canonicalize the module name */
+  {
+    int i;
+    for (i = 0; i < ext - base_name; ++i)
       {
-        size_t i;
-        for (i = 0; i < ext - base_name; ++i)
+       if (isalnum ((int)(base_name[i])))
          {
-           if (isalnum ((int)(base_name[i])))
-             {
-               name[i] = base_name[i];
-             }
-           else
-             {
-               name[i] = '_';
-             }
+           name[i] = base_name[i];
+         }
+       else
+         {
+           name[i] = '_';
          }
-        name[ext - base_name] = LT_EOS_CHAR;
       }
+    name[ext - base_name] = LT_EOS_CHAR;
+  }
 
   /* Check whether we are opening a libtool module (.la extension).  */
   if (ext && streq (ext, archive_ext))
@@ -1857,7 +1857,7 @@
   if (before)
     {
       assert (*ppath <= before);
-      assert (before - *ppath <= strlen (*ppath));
+      assert ((int) (before - *ppath) <= (int) strlen (*ppath));
 
       before = before - *ppath + argz;
     }