Author: aurel32
Date: 2015-02-11 22:04:39 +0000 (Wed, 11 Feb 2015)
New Revision: 6361

Modified:
   glibc-package/branches/glibc-branch-wheezy/debian/patches/any/cvs-wscanf.diff
Log:
Fix cvs-wscanf.diff 


Modified: 
glibc-package/branches/glibc-branch-wheezy/debian/patches/any/cvs-wscanf.diff
===================================================================
--- 
glibc-package/branches/glibc-branch-wheezy/debian/patches/any/cvs-wscanf.diff   
    2015-02-11 21:58:30 UTC (rev 6360)
+++ 
glibc-package/branches/glibc-branch-wheezy/debian/patches/any/cvs-wscanf.diff   
    2015-02-11 22:04:39 UTC (rev 6361)
@@ -56,7 +56,7 @@
 -        size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax                       \
 -                          ? UCHAR_MAX + 1 : 2 * wpmax);                   \
 -        if (use_malloc || !__libc_use_alloca (newsize))                   \
-+        bool fits = __glibc_likely (wpmax <= SIZE_MAX / sizeof (CHAR_T) / 2); 
\
++        bool fits = __builtin_expect (wpmax <= SIZE_MAX / sizeof (CHAR_T) / 
2, 1); \
 +        size_t wpneed = MAX (UCHAR_MAX + 1, 2 * wpmax);                   \
 +        size_t newsize = fits ? wpneed * sizeof (CHAR_T) : SIZE_MAX;      \
 +        if (!__libc_use_alloca (newsize))                                 \


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]

Reply via email to