Update.

2002-04-02  Ulrich Drepper  <drepper@redhat.com>

	* libio/iofclose.c (_IO_new_fclose): Move freeing of backup buffer
	to ...
	* libio/fileops.c (_IO_new_file_close_it): ...here [PR libc/3190].

diff --git a/ChangeLog b/ChangeLog
index 541c0e1f5f05b4e927804f436c80e958aa549fc0..910b561189de916a1b51f107b2544b62c7c2b4c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-02  Ulrich Drepper  <drepper@redhat.com>
+
+       * libio/iofclose.c (_IO_new_fclose): Move freeing of backup buffer
+       to ...
+       * libio/fileops.c (_IO_new_file_close_it): ...here [PR libc/3190].
+
 2002-04-02  Jakub Jelinek  <jakub@redhat.com>
 
        * inet/ether_ntoh.c (__nss_ethers_lookup): Add internal_function.

diff --git a/libio/fileops.c b/libio/fileops.c
index dbea6318f0530bc32a47c323d380261bf0425f8d..7144a872890392f4d9e87c7c2c30f0e147788e65 100644 (file)
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -177,6 +177,8 @@ _IO_new_file_close_it (fp)
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
   else
     {
+      if (_IO_have_wbackup (fp))
+       INTUSE(_IO_free_wbackup_area) (fp);
       INTUSE(_IO_wsetb) (fp, NULL, NULL, 0);
       _IO_wsetg (fp, NULL, NULL, NULL);
       _IO_wsetp (fp, NULL, NULL);

diff --git a/libio/iofclose.c b/libio/iofclose.c
index fb0f7ce19e0a3fc5120ba0a15764f3c74fb0fff2..62d12244c50ee7cd54e3812282ff85fcfbedebd3 100644 (file)
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -76,9 +76,6 @@ _IO_new_fclose (fp)
       __gconv_release_step (cc->__cd_in.__cd.__steps);
       __gconv_release_step (cc->__cd_out.__cd.__steps);
 #endif
-
-      if (_IO_have_wbackup (fp))
-       INTUSE(_IO_free_wbackup_area) (fp);
     }
   else
     {