update to 2.17

[platform/upstream/glibc.git] / debug / wcpcpy_chk.c

diff --git a/debug/wcpcpy_chk.c b/debug/wcpcpy_chk.c
index c48ec68..f910d20 100644 (file)
--- a/debug/wcpcpy_chk.c
+++ b/debug/wcpcpy_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <wchar.h>
 
@@ -34,7 +33,7 @@ __wcpcpy_chk (wchar_t *dest, const wchar_t *src, size_t destlen)
 
   do
     {
-      if (__builtin_expect (destlen-- == 0, 0))
+      if (__glibc_unlikely (destlen-- == 0))
        __chk_fail ();
       c = wcp[off];
       *++wcp = c;