ws2_32: Fix conversion of address in GetAddrInfoW
Bruno Jesus
00cpxxx at gmail.com
Mon Feb 17 22:11:56 CST 2014
On Tue, Feb 18, 2014 at 1:06 AM, Dmitry Timoshkov <dmitry at baikal.ru> wrote:
> Bruno Jesus <00cpxxx at gmail.com> wrote:
>
>> >> + else if(a->ai_canonname || b->ai_canonname)
>> >> + ok(0, "Expected both canonical names present (%p != %p)\n", a->ai_canonname, b->ai_canonname);
>> >
>> > It would look more natural IMHO to use
>> > ok(!a->ai_canonname && !b->ai_canonname, "Expected both canonical names present (%p != %p)\n", a->ai_canonname, b->ai_canonname);
>> > instead of explicit ok(0) (here and in the not unicode variant).
>>
>> Indeed, much better.
>
> Please take into account my typos above (remove '!'s).
If one of the strings are not present both must be null. So it's OK to
have ok(!a->ai_canonname && !b->ai_canonname). Actually I changed the
text to reflect that:
if (a->ai_canonname && b->ai_canonname)
{
ok(!strcmp(a->ai_canonname, b->ai_canonname), "Wrong
canonical name '%s' != '%s'\n",
a->ai_canonname, b->ai_canonname);
}
else
ok(!a->ai_canonname && !b->ai_canonname, "Expected both
names absent (%p != %p)\n",
a->ai_canonname, b->ai_canonname);
I think that it's correct like this.
> --
> Dmitry.
More information about the wine-devel
mailing list