From add40772bf9dc663fb4fefc024ba6d7da72fa55c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 4 Jun 2000 21:26:12 +0000 Subject: [PATCH] Update. 2000-06-04 Ulrich Drepper * iconv/gconv_dl.c (do_release_shlib): Don't reset reference counter for the object we are releasing, just decrement it. Patch by Akira Higuchi . --- ChangeLog | 6 ++++++ iconv/gconv_dl.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a8d897..ec2c846 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-06-04 Ulrich Drepper + + * iconv/gconv_dl.c (do_release_shlib): Don't reset reference + counter for the object we are releasing, just decrement it. + Patch by Akira Higuchi . + 2000-06-04 Jakub Jelinek * sysdeps/i386/fpu/bits/mathinline.h: Only inline sinh, cosh and tanh diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c index d4738b5..710b440 100644 --- a/iconv/gconv_dl.c +++ b/iconv/gconv_dl.c @@ -1,5 +1,5 @@ /* Handle loading/unloading of shared object for transformation. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -18,6 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -154,9 +155,12 @@ do_release_shlib (const void *nodep, VISIT value, int level) return; if (obj == release_handle) - /* This is the object we want to unload. Now set the release - counter to zero. */ - obj->counter = 0; + { + /* This is the object we want to unload. Now decrement the + reference counter. */ + assert (obj->counter > 0); + --obj->counter; + } else if (obj->counter <= 0) { if (--obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL) -- 2.7.4