summary refs log tree commit diff
path: root/iconv/gconv_dl.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-05 02:41:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-05 02:41:25 +0000
commitb79f74cd622578ce5eea1a3ed5840ac53d6b6d93 (patch)
tree2c0e56654a4df00616e8994f181434ddf3246549 /iconv/gconv_dl.c
parentbcf6d602849db60d9651ffade87f18282c75ebd4 (diff)
downloadglibc-b79f74cd622578ce5eea1a3ed5840ac53d6b6d93.tar.gz
glibc-b79f74cd622578ce5eea1a3ed5840ac53d6b6d93.tar.xz
glibc-b79f74cd622578ce5eea1a3ed5840ac53d6b6d93.zip
Update.
2000-09-03  Bruno Haible  <haible@clisp.cons.org>

	* charmaps/EUC-TW: Add commented non-reversible mappings.

2000-09-03  Bruno Haible  <haible@clisp.cons.org>

	* charmaps/CP949: New file.

2000-09-03  Bruno Haible  <haible@clisp.cons.org>

	* charmaps/GB2312: Remove 0x80..0xA0, 0xAA..0xAF, 0xF8..FF.

2000-09-03  Bruno Haible  <haible@clisp.cons.org>

	* charmaps/EUC-JP: Nonreversibly map 0xA1C0 to U+005C and 0x8FA2B7 to
	U+007E.
Diffstat (limited to 'iconv/gconv_dl.c')
-rw-r--r--iconv/gconv_dl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c
index d07f84e31b..308db52c83 100644
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -164,7 +164,9 @@ do_release_shlib (const void *nodep, VISIT value, int level)
     }
   else if (obj->counter <= 0)
     {
-      if (--obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL)
+      if (obj->counter >= -TRIES_BEFORE_UNLOAD)
+	--obj->counter;
+      if (obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL)
 	{
 	  /* Unload the shared object.  */
 	  __libc_dlclose (obj->handle);
@@ -175,7 +177,7 @@ do_release_shlib (const void *nodep, VISIT value, int level)
 
 
 /* Notify system that a shared object is not longer needed.  */
-int
+void
 internal_function
 __gconv_release_shlib (struct __gconv_loaded_object *handle)
 {
@@ -186,8 +188,6 @@ __gconv_release_shlib (struct __gconv_loaded_object *handle)
      with release counts <= 0.  This way we can finally unload them
      if necessary.  */
   __twalk (loaded, do_release_shlib);
-
-  return __GCONV_OK;
 }