OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use __glibc_unlikely in shared code

This commit is contained in:
Siddhesh Poyarekar 2014-07-03 01:30:02 +05:30
parent 99f8dc9220
commit 05fdac772b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2014-07-02 Siddhesh Poyarekar <siddhesh@redhat.com>
* intl/loadmsgcat.c (_nl_load_domain): Use __builtin_expect.
* debug/memcpy_chk.c: Don't include pagecopy.h.
* debug/mempcpy_chk.c: Likewise.
* string/memcpy.c: Likewise.

4
intl/loadmsgcat.c
View File

@ -820,7 +820,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
MAP_PRIVATE, fd, 0);
if (__glibc_likely (data != MAP_FAILED))
if (__builtin_expect (data != MAP_FAILED, 1))
{
/* mmap() call was successful. */
close (fd);
@ -1248,7 +1248,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
/* Get the header entry and look for a plural specification. */
nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
if (__glibc_unlikely (nullentry == (char *) -1))
if (__builtin_expect (nullentry == (char *) -1, 0))
{
__libc_rwlock_fini (domain->conversions_lock);
goto invalid;