diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-10 00:14:54 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-10 00:14:54 +0000 |
| commit | 4202aa6d5cf2cb15d401a0c002baac81389bda8f (patch) | |
| tree | 18fc97a3168b146ba8279157550f80f0b5b8b10d | |
| parent | bbe777ea384e5c367d0fb92f1dc317ad1a27becd (diff) | |
| download | ppe42-gcc-4202aa6d5cf2cb15d401a0c002baac81389bda8f.tar.gz ppe42-gcc-4202aa6d5cf2cb15d401a0c002baac81389bda8f.zip | |
* gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call
iconv_close when handle is not NULL. Thanks to Andrew Haley.
(Output_iconv::finalize): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31876 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/natIconv.cc | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e19e4ef3883..94a1543ef55 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2000-02-09 Tom Tromey <tromey@cygnus.com> + + * gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call + iconv_close when handle is not NULL. Thanks to Andrew Haley. + (Output_iconv::finalize): Likewise. + 2000-02-08 Tom Tromey <tromey@cygnus.com> * java/util/Properties.java (setProperty): New method. diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index ee3490a99b7..cc8488fa369 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -47,7 +47,7 @@ void gnu::gcj::convert::Input_iconv::finalize (void) { #ifdef HAVE_ICONV - if (handle == NULL) + if (handle != NULL) { iconv_close ((iconv_t) handle); handle = NULL; @@ -108,7 +108,7 @@ void gnu::gcj::convert::Output_iconv::finalize (void) { #ifdef HAVE_ICONV - if (handle == NULL) + if (handle != NULL) { iconv_close ((iconv_t) handle); handle = NULL; |
