2008-08-28 Corinna Vinschen <corinna@vinschen.de>

        * libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Optimize condition
        for accepting a converted character.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 82e8015..0304993 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-28  Corinna Vinschen  <corinna@vinschen.de>
+
+       * libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Optimize condition
+       for accepting a converted character.
+
 2008-08-27  Sandra Loosemore  <sandra@codesourcery.com>
 
        * libc/libc.texinfo: Remove "LOCAL KLUGE" that prevents it

diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c
index 3c1dc46..a16d36c 100644 (file)
--- a/newlib/libc/stdlib/wcsrtombs.c
+++ b/newlib/libc/stdlib/wcsrtombs.c
@@ -45,7 +45,7 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
          ps->__count = 0;
          return (size_t)-1;
        }
-      if (n <= len - bytes && bytes <= len)
+      if (n + bytes <= len)
        {
           n += bytes;
          if (dst)