Re: [PATCH COMMITTED] resolv: Replace __builtin_expect with __glibc_unlikely/__glibc_likely

[Florian Weimer <fweimer@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

On 04/19/2017 04:13 PM, Andreas Schwab wrote:
> On Apr 19 2017, fweimer@redhat.com (Florian Weimer) wrote:
> 
>> @@ -633,7 +633,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
>>   			packtmp, sizeof packtmp);
>>     if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
>>       {
>> -      if (__builtin_expect (errno, 0) == EMSGSIZE)
>> +      if (__glibc_unlikely (errno) == EMSGSIZE)
>              (__glibc_unlikely (errno == EMSGSIZE))

Ugh, I really didn't see this. :(

Fixed with the attached patch.

Thanks,
Florian


[-- Attachment #2: unlikely.patch --]
[-- Type: text/x-patch, Size: 734 bytes --]

nss_dns: Correct parentheses for the __glibc_unlikely argument

This fixes commit bee05c9d58a34ec5886faf3b56ecaa56355d94bf.

2017-04-19  Florian Weimer  <fweimer@redhat.com>

	* resolv/nss_dns/dns-host.c (getanswer_r): Fix parentheses.

diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 7099d09..f121aa3 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -633,7 +633,7 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
 			packtmp, sizeof packtmp);
   if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
     {
-      if (__glibc_unlikely (errno) == EMSGSIZE)
+      if (__glibc_unlikely (errno == EMSGSIZE))
 	goto too_small;
 
       n = -1;