lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Use glibc_likely instead __builtin_expect.

Browse Source
This commit is contained in:
Ondřej Bílka
2014-02-10 14:45:42 +01:00
parent 1448f32447
commit a1ffb40e32
466 changed files with 2224 additions and 1655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debug/confstr_chk.c
View File

@ -22,7 +22,7 @@
size_t
__confstr_chk (int name, char *buf, size_t len, size_t buflen)
{
if (__builtin_expect (buflen < len, 0))
if (__glibc_unlikely (buflen < len))
__chk_fail ();
return confstr (name, buf, len);

2
debug/fread_chk.c
View File

@ -39,7 +39,7 @@ __fread_chk (void *__restrict ptr, size_t ptrlen,
__chk_fail ();
}
if (__builtin_expect (bytes_requested > ptrlen, 0))
if (__glibc_unlikely (bytes_requested > ptrlen))
__chk_fail ();
CHECK_FILE (stream, 0);

2
debug/fread_u_chk.c
View File

@ -39,7 +39,7 @@ __fread_unlocked_chk (void *__restrict ptr, size_t ptrlen,
__chk_fail ();
}
if (__builtin_expect (bytes_requested > ptrlen, 0))
if (__glibc_unlikely (bytes_requested > ptrlen))
__chk_fail ();
CHECK_FILE (stream, 0);

4
debug/getgroups_chk.c
View File

@ -22,13 +22,13 @@
int
__getgroups_chk (int size, __gid_t list[], size_t listlen)
{
if (__builtin_expect (size < 0, 0))
if (__glibc_unlikely (size < 0))
{
__set_errno (EINVAL);
return -1;
}
if (__builtin_expect (size * sizeof (__gid_t) > listlen, 0))
if (__glibc_unlikely (size * sizeof (__gid_t) > listlen))
__chk_fail ();
return __getgroups (size, list);

2
debug/mbsnrtowcs_chk.c
View File

@ -23,7 +23,7 @@ size_t
__mbsnrtowcs_chk (wchar_t *dst, const char **src, size_t nmc, size_t len,
mbstate_t *ps, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return __mbsnrtowcs (dst, src, nmc, len, ps);

2
debug/mbsrtowcs_chk.c
View File

@ -23,7 +23,7 @@ size_t
__mbsrtowcs_chk (wchar_t *dst, const char **src, size_t len,
mbstate_t *ps, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return __mbsrtowcs (dst, src, len, ps);

2
debug/mbstowcs_chk.c
View File

@ -23,7 +23,7 @@
size_t
__mbstowcs_chk (wchar_t *dst, const char *src, size_t len, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
mbstate_t state;

2
debug/memcpy_chk.c
View File

@ -29,7 +29,7 @@ __memcpy_chk (dstpp, srcpp, len, dstlen)
size_t len;
size_t dstlen;
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return memcpy (dstpp, srcpp, len);

2
debug/memmove_chk.c
View File

@ -33,7 +33,7 @@ MEMMOVE_CHK (dest, src, len, destlen)
size_t len;
size_t destlen;
{
if (__builtin_expect (destlen < len, 0))
if (__glibc_unlikely (destlen < len))
__chk_fail ();
return memmove (dest, src, len);

2
debug/mempcpy_chk.c
View File

@ -30,7 +30,7 @@ __mempcpy_chk (dstpp, srcpp, len, dstlen)
size_t len;
size_t dstlen;
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return __mempcpy (dstpp, srcpp, len);

2
debug/memset_chk.c
View File

@ -25,7 +25,7 @@ __memset_chk (dstpp, c, len, dstlen)
size_t len;
size_t dstlen;
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return memset (dstpp, c, len);

2
debug/stpcpy_chk.c
View File

@ -34,7 +34,7 @@ __stpcpy_chk (dest, src, destlen)
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
*d++ = *s;
}

4
debug/strcat_chk.c
View File

@ -33,7 +33,7 @@ __strcat_chk (dest, src, destlen)
/* Find the end of the string. */
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *s1++;
}
@ -46,7 +46,7 @@ __strcat_chk (dest, src, destlen)
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *s2++;
*++s1 = c;

2
debug/strcpy_chk.c
View File

@ -56,7 +56,7 @@ __strcpy_chk (dest, src, destlen)
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *s;
*(s++ + off) = c;

14
debug/strncat_chk.c
View File

@ -33,7 +33,7 @@ __strncat_chk (s1, s2, n, s1len)
/* Find the end of S1. */
do
{
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
c = *s1++;
}
@ -49,25 +49,25 @@ __strncat_chk (s1, s2, n, s1len)
size_t n4 = n >> 2;
do
{
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
c = *s2++;
*++s1 = c;
if (c == '\0')
return s;
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
c = *s2++;
*++s1 = c;
if (c == '\0')
return s;
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
c = *s2++;
*++s1 = c;
if (c == '\0')
return s;
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
c = *s2++;
*++s1 = c;
@ -79,7 +79,7 @@ __strncat_chk (s1, s2, n, s1len)
while (n > 0)
{
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
c = *s2++;
*++s1 = c;
@ -90,7 +90,7 @@ __strncat_chk (s1, s2, n, s1len)
if (c != '\0')
{
if (__builtin_expect (s1len-- == 0, 0))
if (__glibc_unlikely (s1len-- == 0))
__chk_fail ();
*++s1 = '\0';
}

2
debug/vsnprintf_chk.c
View File

@ -33,7 +33,7 @@ ___vsnprintf_chk (char *s, size_t maxlen, int flags, size_t slen,
Though, maxlen is supposed to be the size of buffer pointed
to by s, so a conforming program can't pass such maxlen
to *snprintf. */
if (__builtin_expect (slen < maxlen, 0))
if (__glibc_unlikely (slen < maxlen))
__chk_fail ();
_IO_strnfile sf;

4
debug/vswprintf_chk.c
View File

@ -32,7 +32,7 @@ __vswprintf_chk (wchar_t *s, size_t maxlen, int flags, size_t slen,
Though, maxlen is supposed to be the size of buffer pointed
to by s, so a conforming program can't pass such maxlen
to *snprintf. */
if (__builtin_expect (slen < maxlen, 0))
if (__glibc_unlikely (slen < maxlen))
__chk_fail ();
_IO_wstrnfile sf;
@ -44,7 +44,7 @@ __vswprintf_chk (wchar_t *s, size_t maxlen, int flags, size_t slen,
/* We need to handle the special case where MAXLEN is 0. Use the
overflow buffer right from the start. */
if (__builtin_expect (maxlen == 0, 0))
if (__glibc_unlikely (maxlen == 0))
/* Since we have to write at least the terminating L'\0' a buffer
length of zero always makes the function fail. */
return -1;

2
debug/wcpcpy_chk.c
View File

@ -33,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;

2
debug/wcpncpy_chk.c
View File

@ -23,7 +23,7 @@
wchar_t *
__wcpncpy_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
{
if (__builtin_expect (destlen < n, 0))
if (__glibc_unlikely (destlen < n))
__chk_fail ();
/* This function is not often enough used to justify not using a

4
debug/wcscat_chk.c
View File

@ -30,7 +30,7 @@ __wcscat_chk (wchar_t *dest, const wchar_t *src, size_t destlen)
/* Find the end of the string. */
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *s1++;
}
@ -43,7 +43,7 @@ __wcscat_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 = *s2++;
*++s1 = c;

4
debug/wcscpy_chk.c
View File

@ -35,7 +35,7 @@ __wcscpy_chk (wchar_t *dest, const wchar_t *src, size_t n)
do
{
if (__builtin_expect (n-- == 0, 0))
if (__glibc_unlikely (n-- == 0))
__chk_fail ();
c = *wcp++;
wcp[off] = c;
@ -48,7 +48,7 @@ __wcscpy_chk (wchar_t *dest, const wchar_t *src, size_t n)
do
{
if (__builtin_expect (n-- == 0, 0))
if (__glibc_unlikely (n-- == 0))
__chk_fail ();
c = *src++;
*wcp++ = c;

14
debug/wcsncat_chk.c
View File

@ -29,7 +29,7 @@ __wcsncat_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
/* Find the end of DEST. */
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *dest++;
}
@ -45,25 +45,25 @@ __wcsncat_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
size_t n4 = n >> 2;
do
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *src++;
*++dest = c;
if (c == L'\0')
return s;
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *src++;
*++dest = c;
if (c == L'\0')
return s;
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *src++;
*++dest = c;
if (c == L'\0')
return s;
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *src++;
*++dest = c;
@ -75,7 +75,7 @@ __wcsncat_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
while (n > 0)
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
c = *src++;
*++dest = c;
@ -86,7 +86,7 @@ __wcsncat_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
if (c != L'\0')
{
if (__builtin_expect (destlen-- == 0, 0))
if (__glibc_unlikely (destlen-- == 0))
__chk_fail ();
*++dest = L'\0';
}

2
debug/wcsncpy_chk.c
View File

@ -23,7 +23,7 @@
wchar_t *
__wcsncpy_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
{
if (__builtin_expect (destlen < n, 0))
if (__glibc_unlikely (destlen < n))
__chk_fail ();
/* This function is not often enough used to justify not using a

2
debug/wcsnrtombs_chk.c
View File

@ -23,7 +23,7 @@ size_t
__wcsnrtombs_chk (char *dst, const wchar_t **src, size_t nwc, size_t len,
mbstate_t *ps, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return __wcsnrtombs (dst, src, nwc, len, ps);

2
debug/wcsrtombs_chk.c
View File

@ -23,7 +23,7 @@ size_t
__wcsrtombs_chk (char *dst, const wchar_t **src, size_t len,
mbstate_t *ps, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
return __wcsrtombs (dst, src, len, ps);

2
debug/wcstombs_chk.c
View File

@ -23,7 +23,7 @@
size_t
__wcstombs_chk (char *dst, const wchar_t *src, size_t len, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
if (__glibc_unlikely (dstlen < len))
__chk_fail ();
mbstate_t state;

2
debug/wmemcpy_chk.c
View File

@ -23,7 +23,7 @@
wchar_t *
__wmemcpy_chk (wchar_t *s1, const wchar_t *s2, size_t n, size_t ns1)
{
if (__builtin_expect (ns1 < n, 0))
if (__glibc_unlikely (ns1 < n))
__chk_fail ();
return (wchar_t *) memcpy ((char *) s1, (char *) s2, n * sizeof (wchar_t));
}

2
debug/wmemmove_chk.c
View File

@ -23,7 +23,7 @@
wchar_t *
__wmemmove_chk (wchar_t *s1, const wchar_t *s2, size_t n, size_t ns1)
{
if (__builtin_expect (ns1 < n, 0))
if (__glibc_unlikely (ns1 < n))
__chk_fail ();
return (wchar_t *) memmove ((char *) s1, (char *) s2, n * sizeof (wchar_t));
}

2
debug/wmempcpy_chk.c
View File

@ -23,7 +23,7 @@
wchar_t *
__wmempcpy_chk (wchar_t *s1, const wchar_t *s2, size_t n, size_t ns1)
{
if (__builtin_expect (ns1 < n, 0))
if (__glibc_unlikely (ns1 < n))
__chk_fail ();
return (wchar_t *) __mempcpy ((char *) s1, (char *) s2,
n * sizeof (wchar_t));

2
debug/wmemset_chk.c
View File

@ -22,7 +22,7 @@
wchar_t *
__wmemset_chk (wchar_t *s, wchar_t c, size_t n, size_t dstlen)
{
if (__builtin_expect (dstlen < n, 0))
if (__glibc_unlikely (dstlen < n))
__chk_fail ();
return wmemset (s, c, n);