Update.

	* iconv/skeleton.c:  Rename converted written to correcter name
	irreversible.
	* iconv/gconv.c: Rename converted variable to correcter name
	irreversible.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_simple.c: Likewise.
	* iconv/iconv.c: Likewise.
	* iconv/loop.c: Likewise.
	* iconvdata/8bit-gap.c: Likewise.
	* iconvdata/8bit-generic.c: Likewise.
	* iconvdata/ansi_x3.110.c: Likewise.
	* iconvdata/big5.c: Likewise.
	* iconvdata/big5hkscs.c: Likewise.
	* iconvdata/euc-cn.c: Likewise.
	* iconvdata/euc-jp.c: Likewise.
	* iconvdata/euc-kr.c: Likewise.
	* iconvdata/gbgbk.c: Likewise.
	* iconvdata/gbk.c: Likewise.
	* iconvdata/iso-2022-cn.c: Likewise.
	* iconvdata/iso-2022-jp.c: Likewise.
	* iconvdata/iso-2022-kr.c: Likewise.
	* iconvdata/iso646.c: Likewise.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/iso_6937-2.c: Likewise.
	* iconvdata/iso_6937.c: Likewise.
	* iconvdata/johab.c: Likewise.
	* iconvdata/sjis.c: Likewise.
	* iconvdata/t.61.c: Likewise.
	* iconvdata/uhc.c: Likewise.
	* iconvdata/unicode.c: Likewise.
	* iconvdata/utf-16.c: Likewise.

30 files changed, 181 insertions, 142 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e8d6d37b8..613ec4d0ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
 2000-06-10  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconv/skeleton.c:  Rename converted written to correcter name
+	irreversible.
+	* iconv/gconv.c: Rename converted variable to correcter name
+	irreversible.
+	* iconv/gconv_int.h: Likewise.
+	* iconv/gconv_simple.c: Likewise.
+	* iconv/iconv.c: Likewise.
+	* iconv/loop.c: Likewise.
+	* iconvdata/8bit-gap.c: Likewise.
+	* iconvdata/8bit-generic.c: Likewise.
+	* iconvdata/ansi_x3.110.c: Likewise.
+	* iconvdata/big5.c: Likewise.
+	* iconvdata/big5hkscs.c: Likewise.
+	* iconvdata/euc-cn.c: Likewise.
+	* iconvdata/euc-jp.c: Likewise.
+	* iconvdata/euc-kr.c: Likewise.
+	* iconvdata/gbgbk.c: Likewise.
+	* iconvdata/gbk.c: Likewise.
+	* iconvdata/iso-2022-cn.c: Likewise.
+	* iconvdata/iso-2022-jp.c: Likewise.
+	* iconvdata/iso-2022-kr.c: Likewise.
+	* iconvdata/iso646.c: Likewise.
+	* iconvdata/iso8859-1.c: Likewise.
+	* iconvdata/iso_6937-2.c: Likewise.
+	* iconvdata/iso_6937.c: Likewise.
+	* iconvdata/johab.c: Likewise.
+	* iconvdata/sjis.c: Likewise.
+	* iconvdata/t.61.c: Likewise.
+	* iconvdata/uhc.c: Likewise.
+	* iconvdata/unicode.c: Likewise.
+	* iconvdata/utf-16.c: Likewise.
+
 	* sysdeps/unix/sysv/linux/bits/socket.h (struct cmsghdr): Mark
 	__cmsg_data field with __extension__.
 
diff --git a/iconv/gconv.c b/iconv/gconv.c
index fbb77554c4..06e212b2cb 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -29,7 +29,7 @@ int
 internal_function
 __gconv (__gconv_t cd, const unsigned char **inbuf,
 	 const unsigned char *inbufend, unsigned char **outbuf,
-	 unsigned char *outbufend, size_t *converted)
+	 unsigned char *outbufend, size_t *irreversible)
 {
   size_t last_step = cd->__nsteps - 1;
   int result;
@@ -37,8 +37,8 @@ __gconv (__gconv_t cd, const unsigned char **inbuf,
   if (cd == (__gconv_t) -1L)
     return __GCONV_ILLEGAL_DESCRIPTOR;
 
-  assert (converted != NULL);
-  *converted = 0;
+  assert (irreversible != NULL);
+  *irreversible = 0;
 
   cd->__data[last_step].__outbuf = outbuf != NULL ? *outbuf : NULL;
   cd->__data[last_step].__outbufend = outbufend;
@@ -47,7 +47,7 @@ __gconv (__gconv_t cd, const unsigned char **inbuf,
     /* We just flush.  */
     result = DL_CALL_FCT (cd->__steps->__fct,
 			   (cd->__steps, cd->__data, NULL, NULL,
-			    converted, 1, 0));
+			    irreversible, 1, 0));
   else
     {
       const unsigned char *last_start;
@@ -59,7 +59,7 @@ __gconv (__gconv_t cd, const unsigned char **inbuf,
 	  last_start = *inbuf;
 	  result = DL_CALL_FCT (cd->__steps->__fct,
 				 (cd->__steps, cd->__data, inbuf, inbufend,
-				  converted, 0, 0));
+				  irreversible, 0, 0));
 	}
       while (result == __GCONV_EMPTY_INPUT && last_start != *inbuf
 	     && *inbuf + cd->__steps->__min_needed_from <= inbufend);
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 8624f74967..01cebe72c4 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -140,10 +140,10 @@ extern int __gconv_close (__gconv_t cd)
 /* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
    according to rules described by CD and place up to *OUTBYTESLEFT
    bytes in buffer starting at *OUTBUF.  Return number of non-identical
-   conversions in *CONVERTED if this pointer is not null.  */
+   conversions in *IRREVERSIBLE if this pointer is not null.  */
 extern int __gconv (__gconv_t __cd, const unsigned char **__inbuf,
 		    const unsigned char *inbufend, unsigned char **__outbuf,
-		    unsigned char *outbufend, size_t *converted)
+		    unsigned char *outbufend, size_t *irreversible)
      internal_function;
 
 /* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index 7a1e6344a2..4b7004caa6 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -64,7 +64,8 @@ static const unsigned char encoding_byte[] =
 static inline int
 internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
 		    unsigned char **outptrp, unsigned char *outend,
-		    mbstate_t *state, int flags, void *data, size_t *converted)
+		    mbstate_t *state, int flags, void *data,
+		    size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -105,7 +106,7 @@ internal_ucs4_loop_unaligned (const unsigned char **inptrp,
 			      const unsigned char *inend,
 			      unsigned char **outptrp, unsigned char *outend,
 			      mbstate_t *state, int flags, void *data,
-			      size_t *converted)
+			      size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -152,7 +153,7 @@ internal_ucs4_loop_single (const unsigned char **inptrp,
 			   const unsigned char *inend,
 			   unsigned char **outptrp, unsigned char *outend,
 			   mbstate_t *state, int flags, void *data,
-			   size_t *converted)
+			   size_t *irreversible)
 {
   size_t cnt = state->__count & 7;
 
@@ -206,7 +207,8 @@ internal_ucs4_loop_single (const unsigned char **inptrp,
 static inline int
 ucs4_internal_loop (const unsigned char **inptrp, const unsigned char *inend,
 		    unsigned char **outptrp, unsigned char *outend,
-		    mbstate_t *state, int flags, void *data, size_t *converted)
+		    mbstate_t *state, int flags, void *data,
+		    size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -229,7 +231,7 @@ ucs4_internal_loop (const unsigned char **inptrp, const unsigned char *inend,
 	  if (flags & __GCONV_IGNORE_ERRORS)
 	    {
 	      /* Just ignore this character.  */
-	      ++*converted;
+	      ++*irreversible;
 	      continue;
 	    }
 
@@ -261,7 +263,7 @@ ucs4_internal_loop_unaligned (const unsigned char **inptrp,
 			      const unsigned char *inend,
 			      unsigned char **outptrp, unsigned char *outend,
 			      mbstate_t *state, int flags, void *data,
-			      size_t *converted)
+			      size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -277,7 +279,7 @@ ucs4_internal_loop_unaligned (const unsigned char **inptrp,
 	  if (flags & __GCONV_IGNORE_ERRORS)
 	    {
 	      /* Just ignore this character.  */
-	      ++*converted;
+	      ++*irreversible;
 	      continue;
 	    }
 
@@ -320,7 +322,7 @@ ucs4_internal_loop_single (const unsigned char **inptrp,
 			   const unsigned char *inend,
 			   unsigned char **outptrp, unsigned char *outend,
 			   mbstate_t *state, int flags, void *data,
-			   size_t *converted)
+			   size_t *irreversible)
 {
   size_t cnt = state->__count & 7;
 
@@ -387,7 +389,7 @@ static inline int
 internal_ucs4le_loop (const unsigned char **inptrp, const unsigned char *inend,
 		      unsigned char **outptrp, unsigned char *outend,
 		      mbstate_t *state, int flags, void *data,
-		      size_t *converted)
+		      size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -428,7 +430,7 @@ internal_ucs4le_loop_unaligned (const unsigned char **inptrp,
 				const unsigned char *inend,
 				unsigned char **outptrp, unsigned char *outend,
 				mbstate_t *state, int flags, void *data,
-				size_t *converted)
+				size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -475,7 +477,7 @@ internal_ucs4le_loop_single (const unsigned char **inptrp,
 			     const unsigned char *inend,
 			     unsigned char **outptrp, unsigned char *outend,
 			     mbstate_t *state, int flags, void *data,
-			     size_t *converted)
+			     size_t *irreversible)
 {
   size_t cnt = state->__count & 7;
 
@@ -527,7 +529,7 @@ static inline int
 ucs4le_internal_loop (const unsigned char **inptrp, const unsigned char *inend,
 		      unsigned char **outptrp, unsigned char *outend,
 		      mbstate_t *state, int flags, void *data,
-		      size_t *converted)
+		      size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -550,7 +552,7 @@ ucs4le_internal_loop (const unsigned char **inptrp, const unsigned char *inend,
 	  if (flags & __GCONV_IGNORE_ERRORS)
 	    {
 	      /* Just ignore this character.  */
-	      ++*converted;
+	      ++*irreversible;
 	      continue;
 	    }
 
@@ -580,7 +582,7 @@ ucs4le_internal_loop_unaligned (const unsigned char **inptrp,
 				const unsigned char *inend,
 				unsigned char **outptrp, unsigned char *outend,
 				mbstate_t *state, int flags, void *data,
-				size_t *converted)
+				size_t *irreversible)
 {
   const unsigned char *inptr = *inptrp;
   unsigned char *outptr = *outptrp;
@@ -596,7 +598,7 @@ ucs4le_internal_loop_unaligned (const unsigned char **inptrp,
 	  if (flags & __GCONV_IGNORE_ERRORS)
 	    {
 	      /* Just ignore this character.  */
-	      ++*converted;
+	      ++*irreversible;
 	      continue;
 	    }
 
@@ -641,7 +643,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 			     const unsigned char *inend,
 			     unsigned char **outptrp, unsigned char *outend,
 			     mbstate_t *state, int flags, void *data,
-			     size_t *converted)
+			     size_t *irreversible)
 {
   size_t cnt = state->__count & 7;
 
@@ -715,7 +717,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
 	++inptr; 							      \
       }									      \
     else								      \
@@ -753,7 +755,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
 	inptr += 4; 							      \
       }									      \
     else								      \
@@ -933,7 +935,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 	      {								      \
 		/* Ignore it.  */					      \
 		inptr += i;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -963,7 +965,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 	    if (ignore_errors_p ())					      \
 	      {								      \
 		inptr += i;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -1130,7 +1132,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 	  }								      \
 									      \
 	inptr += 4;							      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else 								      \
       *((uint16_t *) outptr)++ = *((uint32_t *) inptr)++;		      \
@@ -1186,7 +1188,7 @@ ucs4le_internal_loop_single (const unsigned char **inptrp,
 	  }								      \
 									      \
 	inptr += 4;							      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     *((uint16_t *) outptr)++ = bswap_16 (val);				      \
     inptr += 4;								      \
diff --git a/iconv/iconv.c b/iconv/iconv.c
index 58d977e949..53c1f97e3b 100644
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -34,17 +34,17 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
 {
   __gconv_t gcd = (__gconv_t) cd;
   char *outstart = outbuf ? *outbuf : NULL;
-  size_t converted;
+  size_t irreversible;
   int result;
 
   if (__builtin_expect (inbuf == NULL || *inbuf == NULL, 0))
     {
       if (outbuf == NULL || *outbuf == NULL)
-	result = __gconv (gcd, NULL, NULL, NULL, NULL, &converted);
+	result = __gconv (gcd, NULL, NULL, NULL, NULL, &irreversible);
       else
 	result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
 			  (unsigned char *) (outstart + *outbytesleft),
-			  &converted);
+			  &irreversible);
     }
   else
     {
@@ -54,7 +54,7 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
 			(const unsigned char *)  (*inbuf + *inbytesleft),
 			(unsigned char **) outbuf,
 			(unsigned char *) (*outbuf + *outbytesleft),
-			&converted);
+			&irreversible);
 
       *inbytesleft -= *inbuf - instart;
     }
@@ -65,22 +65,22 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
     {
     case __GCONV_ILLEGAL_DESCRIPTOR:
       __set_errno (EBADF);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
     case __GCONV_ILLEGAL_INPUT:
       __set_errno (EILSEQ);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
     case __GCONV_FULL_OUTPUT:
       __set_errno (E2BIG);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
     case __GCONV_INCOMPLETE_INPUT:
       __set_errno (EINVAL);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
     case __GCONV_EMPTY_INPUT:
@@ -92,5 +92,5 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
       assert (!"Nothing like this should happen");
     }
 
-  return converted;
+  return irreversible;
 }
diff --git a/iconv/loop.c b/iconv/loop.c
index 473d0a3922..c01e52040e 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -177,8 +177,8 @@
 static inline int
 FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
 		   unsigned char **outptrp, unsigned char *outend,
-		   mbstate_t *state, int flags, void *data, size_t *converted
-		   EXTRA_LOOP_DECLS)
+		   mbstate_t *state, int flags, void *data,
+		   size_t *irreversible EXTRA_LOOP_DECLS)
 {
   int result = __GCONV_OK;
   const unsigned char *inptr = *inptrp;
@@ -293,7 +293,7 @@ FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
 static inline int
 SINGLE(LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
 		 unsigned char **outptrp, unsigned char *outend,
-		 mbstate_t *state, int flags, void *data, size_t *converted
+		 mbstate_t *state, int flags, void *data, size_t *irreversible
 		 EXTRA_LOOP_DECLS)
 {
   int result = __GCONV_OK;
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index bf4e11f37a..9b7b4a1125 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -271,7 +271,7 @@ gconv_init (struct __gconv_step *step)
 int
 FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 	       const unsigned char **inptrp, const unsigned char *inend,
-	       size_t *written, int do_flush, int consume_incomplete)
+	       size_t *irreversible, int do_flush, int consume_incomplete)
 {
   struct __gconv_step *next_step = step + 1;
   struct __gconv_step_data *next_data = data + 1;
@@ -295,7 +295,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
          successfully emitted the escape sequence.  */
       if (status == __GCONV_OK && ! (data->__flags & __GCONV_IS_LAST))
 	status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL,
-				    written, 1, consume_incomplete));
+				    irreversible, 1, consume_incomplete));
     }
   else
     {
@@ -306,7 +306,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
       unsigned char *outstart;
       /* This variable is used to count the number of characters we
 	 actually converted.  */
-      size_t converted = 0;
+      size_t lirreversible = 0;
 #if defined _STRING_ARCH_unaligned \
     || MIN_NEEDED_FROM == 1 || MAX_NEEDED_FROM % MIN_NEEDED_FROM != 0 \
     || MIN_NEEDED_TO == 1 || MAX_NEEDED_TO % MIN_NEEDED_TO != 0
@@ -335,7 +335,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 	  if (MAX_NEEDED_TO == 1 || FROM_DIRECTION)
 	    status = SINGLE(FROM_LOOP) (inptrp, inend, &outbuf, outend,
 					data->__statep, data->__flags,
-					step->__data, &converted
+					step->__data, &lirreversible
 					EXTRA_LOOP_ARGS);
 # endif
 # if MAX_NEEDED_FROM > 1 && MAX_NEEDED_TO > 1 && !ONE_DIRECTION
@@ -344,7 +344,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 # if MAX_NEEDED_TO > 1 && !ONE_DIRECTION
 	    status = SINGLE(TO_LOOP) (inptrp, inend, &outbuf, outend,
 				      data->__statep, data->__flags,
-				      step->__data, &converted
+				      step->__data, &lirreversible
 				      EXTRA_LOOP_ARGS);
 # endif
 
@@ -388,12 +388,14 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 		/* Run the conversion loop.  */
 		status = FROM_LOOP (inptrp, inend, &outbuf, outend,
 				    data->__statep, data->__flags,
-				    step->__data, &converted EXTRA_LOOP_ARGS);
+				    step->__data, &lirreversible
+				    EXTRA_LOOP_ARGS);
 	      else
 		/* Run the conversion loop.  */
 		status = TO_LOOP (inptrp, inend, &outbuf, outend,
 				  data->__statep, data->__flags,
-				  step->__data, &converted EXTRA_LOOP_ARGS);
+				  step->__data, &lirreversible
+				  EXTRA_LOOP_ARGS);
 	    }
 #if !defined _STRING_ARCH_unaligned \
     && MIN_NEEDED_FROM != 1 && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0 \
@@ -405,14 +407,16 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 		status = GEN_unaligned (FROM_LOOP) (inptrp, inend, &outbuf,
 						    outend, data->__statep,
 						    data->__flags,
-						    step->__data, &converted
+						    step->__data,
+						    &lirreversible
 						    EXTRA_LOOP_ARGS);
 	      else
 		/* Run the conversion loop.  */
 		status = GEN_unaligned (TO_LOOP) (inptrp, inend, &outbuf,
 						  outend, data->__statep,
 						  data->__flags,
-						  step->__data, &converted
+						  step->__data,
+						  &lirreversible
 						  EXTRA_LOOP_ARGS);
 	    }
 #endif
@@ -427,8 +431,9 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 	      /* Store information about how many bytes are available.  */
 	      data->__outbuf = outbuf;
 
-	      /* Remember how many non-identical characters we converted.  */
-	      *written += converted;
+	      /* Remember how many non-identical characters we
+                 converted in a irreversible way.  */
+	      *irreversible += lirreversible;
 
 	      break;
 	    }
@@ -440,7 +445,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 	      int result;
 
 	      result = DL_CALL_FCT (fct, (next_step, next_data, &outerr,
-					  outbuf, written, 0,
+					  outbuf, irreversible, 0,
 					  consume_incomplete));
 
 	      if (result != __GCONV_EMPTY_INPUT)
@@ -471,7 +476,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 					     (unsigned char **) &outbuf,
 					     (unsigned char *) outerr,
 					     data->__statep, data->__flags,
-					     step->__data, &converted
+					     step->__data, &lirreversible
 					     EXTRA_LOOP_ARGS);
 		      else
 			/* Run the conversion loop.  */
@@ -480,7 +485,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 					   (unsigned char **) &outbuf,
 					   (unsigned char *) outerr,
 					   data->__statep, data->__flags,
-					   step->__data, &converted
+					   step->__data, &lirreversible
 					   EXTRA_LOOP_ARGS);
 
 		      /* We must run out of output buffer space in this
diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index 75493f758f..2d66f8b666 100644
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -57,7 +57,7 @@ struct gap
 	    break;							      \
 	  }								      \
 									      \
-	++*converted; 							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
@@ -89,7 +89,7 @@ struct gap
 	    break;							      \
 	  }								      \
 									      \
-	++*converted; 							      \
+	++*irreversible;						      \
 	inptr += 4;							      \
 	continue;							      \
       }									      \
@@ -104,7 +104,7 @@ struct gap
 	    break;							      \
 	  }								      \
 									      \
-	++*converted; 							      \
+	++*irreversible;						      \
 	inptr += 4;							      \
 	continue;							      \
       }									      \
@@ -119,7 +119,7 @@ struct gap
 	    break;							      \
 	  }								      \
 									      \
-	++*converted; 							      \
+	++*irreversible;						      \
 	inptr += 4;							      \
 	continue;							      \
       }									      \
diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c
index 398bd67ba4..97ca193194 100644
--- a/iconvdata/8bit-generic.c
+++ b/iconvdata/8bit-generic.c
@@ -43,7 +43,7 @@
 	    break;							      \
 	  }								      \
 									      \
-	++*converted; 							      \
+	++*irreversible;						      \
       }									      \
 									      \
     put32 (outptr, ch);							      \
@@ -71,7 +71,7 @@
 	    break;							      \
 	  }								      \
 									      \
-	++*converted; 							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       *outptr++ = from_ucs4[ch];					      \
diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
index bacbfd23ad..2dd082d3b9 100644
--- a/iconvdata/ansi_x3.110.c
+++ b/iconvdata/ansi_x3.110.c
@@ -426,7 +426,7 @@ static const char from_ucs4[][2] =
 		break;							      \
 	      }								      \
 									      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    incr = 1;							      \
 	  }								      \
 	else								      \
@@ -501,7 +501,7 @@ static const char from_ucs4[][2] =
 		    break;						      \
 		  }							      \
 									      \
-		++*converted; 						      \
+		++*irreversible;					      \
 		inptr += 4;						      \
 		continue;						      \
 	      }								      \
@@ -549,7 +549,7 @@ static const char from_ucs4[][2] =
 		break;							      \
 	      }								      \
 									      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    inptr += 4;							      \
 	    continue;							      \
 	  }								      \
@@ -567,7 +567,7 @@ static const char from_ucs4[][2] =
 		break;							      \
 	      }								      \
 									      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    inptr += 4;							      \
 	    continue;							      \
 	  }								      \
diff --git a/iconvdata/big5.c b/iconvdata/big5.c
index 363b2506d6..a52f850f73 100644
--- a/iconvdata/big5.c
+++ b/iconvdata/big5.c
@@ -8463,7 +8463,7 @@ static const char from_ucs4_tab13[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -8481,7 +8481,7 @@ static const char from_ucs4_tab13[][2] =
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -8589,7 +8589,7 @@ static const char from_ucs4_tab13[][2] =
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c
index 083b077c94..1ca22d65a6 100644
--- a/iconvdata/big5hkscs.c
+++ b/iconvdata/big5hkscs.c
@@ -12617,7 +12617,7 @@ static const char from_ucs4_tab14[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -12635,7 +12635,7 @@ static const char from_ucs4_tab14[][2] =
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -12746,7 +12746,7 @@ static const char from_ucs4_tab14[][2] =
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c
index b4c1725eea..2c2b36e433 100644
--- a/iconvdata/euc-cn.c
+++ b/iconvdata/euc-cn.c
@@ -55,7 +55,7 @@
 	    }								      \
 									      \
 	  ++inptr;							      \
-	  ++*converted;							      \
+	  ++*irreversible;						      \
 	  continue;							      \
 	}								      \
       else								      \
@@ -85,7 +85,7 @@
 		}							      \
 									      \
 	      ++inptr;							      \
-	      ++*converted;						      \
+	      ++*irreversible;						      \
 	      continue;							      \
 	    }								      \
 									      \
@@ -104,7 +104,7 @@
 		}							      \
 									      \
 	      inptr += 2;						      \
-	      ++*converted;						      \
+	      ++*irreversible;						      \
 	      continue;							      \
 	    }								      \
 									      \
@@ -148,7 +148,7 @@
 		  }							      \
 									      \
 		inptr += 4;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index a781182e78..93622e778e 100644
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -57,7 +57,7 @@
 	  }								      \
 									      \
 	++inptr;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
     else								      \
@@ -87,7 +87,7 @@
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -137,7 +137,7 @@
 		  }							      \
 									      \
 		inptr += 2;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 	    inptr = endp;						      \
@@ -228,7 +228,7 @@
 		      }							      \
 									      \
 		    inptr += 4;						      \
-		    ++*converted;					      \
+		    ++*irreversible;					      \
 		    continue;						      \
 		  }							      \
 	      }								      \
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index 48fdee3cdc..f067fbc548 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -91,7 +91,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 	  }								      \
 									      \
 	++inptr;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
     else								      \
@@ -117,7 +117,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -152,7 +152,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 	  }								      \
 									      \
 	inptr += 4;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
 									      \
diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c
index 9a3e385cba..0fbbfc81e4 100644
--- a/iconvdata/gbgbk.c
+++ b/iconvdata/gbgbk.c
@@ -108,7 +108,7 @@
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	  }								      \
 	else								      \
 	  {								      \
diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c
index 405a3f8b23..952f76ab73 100644
--- a/iconvdata/gbk.c
+++ b/iconvdata/gbk.c
@@ -13132,7 +13132,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 	    }								      \
 									      \
 	  ++inptr;							      \
-	  ++*converted;							      \
+	  ++*irreversible;						      \
 	  continue;							      \
 	}								      \
       else								      \
@@ -13164,7 +13164,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 		}							      \
 									      \
 	      ++inptr;							      \
-	      ++*converted;						      \
+	      ++*irreversible;						      \
 	      continue;							      \
 	    }								      \
 									      \
@@ -13184,7 +13184,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 		}							      \
 									      \
 	      inptr += 2;						      \
-	      ++*converted;						      \
+	      ++*irreversible;						      \
 	      continue;							      \
 	    }								      \
 									      \
@@ -13456,7 +13456,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 	      break;							      \
 	    }								      \
 									      \
-	  ++*converted;							      \
+	  ++*irreversible;						      \
 	}								      \
       /* See whether there is enough room for the second byte we write.  */   \
       else if (NEED_LENGTH_TEST && cp[1] != '\0'			      \
diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c
index c224ee7eac..38b138b928 100644
--- a/iconvdata/iso-2022-cn.c
+++ b/iconvdata/iso-2022-cn.c
@@ -128,7 +128,7 @@ enum
 	  }								      \
 									      \
 	++inptr;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
 									      \
@@ -203,7 +203,7 @@ enum
 		break;							      \
 	      }								      \
 									      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -240,7 +240,7 @@ enum
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -332,7 +332,7 @@ enum
 		      }							      \
 									      \
 		    inptr += 4;						      \
-		    ++*converted;					      \
+		    ++*irreversible;					      \
 		    continue;						      \
 		  }							      \
 	      }								      \
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index 8fc67b2b43..9b22ddd6b3 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -367,7 +367,7 @@ gconv_end (struct __gconv_step *data)
 		  }							      \
 									      \
 		++inptr;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 	    ch = iso88597_to_ucs4[inptr[2] - 0x20];			      \
@@ -380,7 +380,7 @@ gconv_end (struct __gconv_step *data)
 		  }							      \
 									      \
 		inptr += 3;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 	    inptr += 3;							      \
@@ -394,7 +394,7 @@ gconv_end (struct __gconv_step *data)
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -414,7 +414,7 @@ gconv_end (struct __gconv_step *data)
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	++inptr;							      \
@@ -432,7 +432,7 @@ gconv_end (struct __gconv_step *data)
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	++inptr;							      \
@@ -477,7 +477,7 @@ gconv_end (struct __gconv_step *data)
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -722,7 +722,7 @@ gconv_end (struct __gconv_step *data)
 			break;						      \
 		      }							      \
 									      \
-		    ++*converted;					      \
+		    ++*irreversible;					      \
 		  }							      \
 		else							      \
 		  {							      \
@@ -908,7 +908,7 @@ gconv_end (struct __gconv_step *data)
 					     break;			      \
 					  }				      \
 									      \
-					++*converted;			      \
+					++*irreversible;		      \
 				      }					      \
 				  }					      \
 			      }						      \
diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c
index c4ef73e299..99208c9522 100644
--- a/iconvdata/iso-2022-kr.c
+++ b/iconvdata/iso-2022-kr.c
@@ -130,7 +130,7 @@ enum
 	  }								      \
 									      \
 	++inptr;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
 									      \
@@ -201,7 +201,7 @@ enum
 		break;							      \
 	      }								      \
 									      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    ++inptr;							      \
 	    continue;							      \
 	  }								      \
@@ -261,7 +261,7 @@ enum
 		break;							      \
 	      }								      \
 									      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	  }								      \
 	else								      \
 	  {								      \
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index ea36ebc5cd..cdc77fc651 100644
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -413,7 +413,7 @@ gconv_end (struct __gconv_step *data)
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
@@ -890,7 +890,7 @@ gconv_end (struct __gconv_step *data)
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       *outptr++ = (unsigned char) ch;					      \
diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c
index f40da077bb..7a5be60373 100644
--- a/iconvdata/iso8859-1.c
+++ b/iconvdata/iso8859-1.c
@@ -54,7 +54,7 @@
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       *outptr++ = (unsigned char) ch;					      \
diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c
index a3c8be6b33..6895879744 100644
--- a/iconvdata/iso_6937-2.c
+++ b/iconvdata/iso_6937-2.c
@@ -427,7 +427,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -444,7 +444,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -465,7 +465,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	++inptr;							      \
@@ -577,7 +577,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -590,7 +590,7 @@ static const char from_ucs4[][2] =
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
 	inptr += 4;							      \
 	continue;							      \
       }									      \
diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c
index 391adf9f17..d27b923689 100644
--- a/iconvdata/iso_6937.c
+++ b/iconvdata/iso_6937.c
@@ -419,7 +419,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -436,7 +436,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -457,7 +457,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	++inptr;							      \
@@ -548,7 +548,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -561,7 +561,7 @@ static const char from_ucs4[][2] =
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
 	inptr += 4;							      \
 	continue;							      \
       }									      \
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index fccfbabd4e..50b974686b 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -193,7 +193,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	else								      \
@@ -235,7 +235,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		      }							      \
 									      \
 		    ++inptr;						      \
-		    ++*converted;					      \
+		    ++*irreversible;					      \
 		    continue;						      \
 		  }							      \
 		else if (i > 0 && m > 0)				      \
@@ -258,7 +258,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		      }							      \
 									      \
 		    ++inptr;						      \
-		    ++*converted;					      \
+		    ++*irreversible;					      \
 		    continue;						      \
 		  }							      \
 	      }								      \
@@ -279,7 +279,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		      }							      \
 									      \
 		    ++inptr;						      \
-		    ++*converted;					      \
+		    ++*irreversible;					      \
 		    continue;						      \
 		  }							      \
 		else							      \
@@ -309,7 +309,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -404,7 +404,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		  }							      \
 									      \
 		inptr += 4;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -441,7 +441,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		  }							      \
 									      \
 		inptr += 4;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 172246843c..0f38362fb3 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -4367,7 +4367,7 @@ static const char from_ucs4_extra[0x100][2] =
 	  }								      \
 									      \
 	++inptr;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
     else								      \
@@ -4402,7 +4402,7 @@ static const char from_ucs4_extra[0x100][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	else								      \
@@ -4433,7 +4433,7 @@ static const char from_ucs4_extra[0x100][2] =
 	      }								      \
 									      \
 	    inptr += 2;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -4474,7 +4474,7 @@ static const char from_ucs4_extra[0x100][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
@@ -4491,7 +4491,7 @@ static const char from_ucs4_extra[0x100][2] =
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c
index 766dd0fe97..74fbf8aca7 100644
--- a/iconvdata/t.61.c
+++ b/iconvdata/t.61.c
@@ -411,7 +411,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    ++inptr;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -432,7 +432,7 @@ static const char from_ucs4[][2] =
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
@@ -475,7 +475,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 	else								      \
@@ -502,7 +502,7 @@ static const char from_ucs4[][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
       }									      \
diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c
index 767c21f513..d62f93bf29 100644
--- a/iconvdata/uhc.c
+++ b/iconvdata/uhc.c
@@ -3076,7 +3076,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 	  }								      \
 									      \
 	++inptr;							      \
-	++*converted;							      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
     else								      \
@@ -3130,7 +3130,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 		  }							      \
 									      \
 		++inptr;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -3151,7 +3151,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 		  }							      \
 									      \
 		inptr += 2;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -3171,7 +3171,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 		  }							      \
 									      \
 		inptr += 2;						      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 	  }								      \
@@ -3229,7 +3229,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
@@ -3261,7 +3261,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 	      }								      \
 									      \
 	    inptr += 4;							      \
-	    ++*converted;						      \
+	    ++*irreversible;						      \
 	    continue;							      \
 	  }								      \
 									      \
diff --git a/iconvdata/unicode.c b/iconvdata/unicode.c
index 34c563bd79..5309fc267f 100644
--- a/iconvdata/unicode.c
+++ b/iconvdata/unicode.c
@@ -158,7 +158,7 @@ gconv_end (struct __gconv_step *data)
 	    break;							      \
 	  }								      \
 									      \
-	++*converted;							      \
+	++*irreversible;						      \
       }									      \
     else								      \
       {									      \
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index 0be1108113..d24b55b2bc 100644
--- a/iconvdata/utf-16.c
+++ b/iconvdata/utf-16.c
@@ -208,7 +208,7 @@ gconv_end (struct __gconv_step *data)
 		    break;						      \
 		  }							      \
 									      \
-		++*converted;						      \
+		++*irreversible;					      \
 		inptr += 4;						      \
 		continue;						      \
 	      }								      \
@@ -241,7 +241,7 @@ gconv_end (struct __gconv_step *data)
 		    break;						      \
 		  }							      \
 									      \
-		++*converted;						      \
+		++*irreversible;					      \
 		inptr += 4;						      \
 		continue;						      \
 	      }								      \
@@ -315,7 +315,7 @@ gconv_end (struct __gconv_step *data)
 		    break;						      \
 		  }							      \
 									      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -358,7 +358,7 @@ gconv_end (struct __gconv_step *data)
 		    break;						      \
 		  }							      \
 									      \
-		++*converted;						      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \