Add #include <stdint.h> for uint[32|64]_t usage (except installed headers).

[platform/upstream/glibc.git] / iconv / gconv_close.c

diff --git a/iconv/gconv_close.c b/iconv/gconv_close.c
index d3d023f..89b8d7f 100644 (file)
--- a/iconv/gconv_close.c
+++ b/iconv/gconv_close.c
@@ -1,62 +1,62 @@
 /* Release any resource associated with given conversion descriptor.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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/>.  */
 
-#include <gconv.h>
 #include <stdlib.h>
 
+#include <gconv_int.h>
+
 
 int
-__gconv_close (gconv_t cd)
+internal_function
+__gconv_close (__gconv_t cd)
 {
-  struct gconv_step *srunp;
-  struct gconv_step_data *drunp;
+  struct __gconv_step *srunp;
+  struct __gconv_step_data *drunp;
   size_t nsteps;
 
   /* Free all resources by calling destructor functions and release
      the implementations.  */
-  srunp = cd->steps;
-  nsteps = cd->nsteps;
-  drunp = cd->data;
+  srunp = cd->__steps;
+  nsteps = cd->__nsteps;
+  drunp = cd->__data;
   do
     {
-      /* Call destructor.  */
-      if (srunp->end_fct != NULL)
-       (*srunp->end_fct) (drunp);
-      else
+      struct __gconv_trans_data *transp;
+
+      transp = drunp->__trans;
+      while (transp != NULL)
        {
-         free (drunp->outbuf);
-         if (drunp->data != NULL)
-           free (drunp->data);
+         struct __gconv_trans_data *curp = transp;
+         transp = transp->__next;
+
+         if (__builtin_expect (curp->__trans_end_fct != NULL, 0))
+           curp->__trans_end_fct (curp->__data);
+
+         free (curp);
        }
 
-      /* Next step.  */
-      ++srunp;
-      ++drunp;
+      if (!(drunp->__flags & __GCONV_IS_LAST) && drunp->__outbuf != NULL)
+       free (drunp->__outbuf);
     }
-  while (!drunp->is_last);
-
-  /* Save the pointer, we need it below.  */
-  srunp = cd->steps;
+  while (!((drunp++)->__flags & __GCONV_IS_LAST));
 
   /* Free the data allocated for the descriptor.  */
-  free (cd->data);
   free (cd);
 
   /* Close the participating modules.  */