Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / iconv / gconv_dl.c

diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c
index 0ed71b74985da665e8d1e70e2222d113e7391500..3bb732e76679def512b5323ce298c035ec0b90cc 100644 (file)
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <dlfcn.h>
@@ -149,15 +149,10 @@ __gconv_find_shlib (const char *name)
   return found;
 }
 
-
-/* This is very ugly but the tsearch functions provide no way to pass
-   information to the walker function.  So we use a global variable.
-   It is MT safe since we use a lock.  */
-static struct __gconv_loaded_object *release_handle;
-
 static void
-do_release_shlib (void *nodep, VISIT value, int level)
+do_release_shlib (const void *nodep, VISIT value, void *closure)
 {
+  struct __gconv_loaded_object *release_handle = closure;
   struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
 
   if (value != preorder && value != leaf)
@@ -184,13 +179,10 @@ do_release_shlib (void *nodep, VISIT value, int level)
 void
 __gconv_release_shlib (struct __gconv_loaded_object *handle)
 {
-  /* Urgh, this is ugly but we have no other possibility.  */
-  release_handle = handle;
-
   /* Process all entries.  Please note that we also visit entries
      with release counts <= 0.  This way we can finally unload them
      if necessary.  */
-  __twalk (loaded, (__action_fn_t) do_release_shlib);
+  __twalk_r (loaded, do_release_shlib, handle);
 }
 
 
@@ -224,9 +216,9 @@ do_print (const void *nodep, VISIT value, int level)
   struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
 
   printf ("%10s: \"%s\", %d\n",
-         value == leaf ? "leaf" :
-         value == preorder ? "preorder" :
-         value == postorder ? "postorder" : "endorder",
+         value == leaf ? "leaf"
+         : value == preorder ? "preorder"
+         : value == postorder ? "postorder" : "endorder",
          obj->name, obj->counter);
 }