From: Bruno Haible <bruno@clisp.org>
Date: Wed, 22 Mar 2023 14:01:53 +0000 (+0100)
Subject: vasnwprintf: Simplify last change.
X-Git-Tag: v1.0~1607
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b07085538e9ec21a185d49953edec965bf704c4d;p=gnulib.git

vasnwprintf: Simplify last change.

* lib/vasnprintf.c (VASNPRINTF): Remove unused variable 'len'.
---

diff --git a/ChangeLog b/ChangeLog
index 568db7a8da..e869463550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-22  Bruno Haible  <bruno@clisp.org>
+
+	vasnwprintf: Simplify last change.
+	* lib/vasnprintf.c (VASNPRINTF): Remove unused variable 'len'.
+
 2023-03-22  Bruno Haible  <bruno@clisp.org>
 
 	vasnwprintf tests: Fix link errors on AIX.
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 8e6596df2f..fa9344b831 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -5885,11 +5885,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         memset (&state, '\0', sizeof (mbstate_t));
                         {
                           DCHAR_T *destptr = tmpdst;
-                          size_t len = tmpdst_len;
                           const TCHAR_T *src = tmpsrc;
                           size_t srclen = count;
 
-                          for (; srclen > 0; destptr++, len--)
+                          for (; srclen > 0; destptr++)
                             {
                               /* Parse the next multibyte character.  */
                               size_t ret = mbrtowc (destptr, src, srclen, &state);
@@ -5902,10 +5901,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                               src += ret;
                               srclen -= ret;
                             }
-                          /* By the way tmpdst_len was computed, len should now
-                             be 0.  */
-                          if (len != 0)
-                            abort ();
                         }
 # else
                         tmpdst =