wok-undigest annotate glibc/stuff/glibc-2.14-revert-4768ae77.patch @ rev 1182

Add libgio(2.32.->2.43.), glibc(with mtune), kde-menu, build mplayer (1.2)
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Mon Nov 02 07:47:23 2015 +0100 (2015-11-02)
parents
children
rev   line source
pankso@674 1 diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
pankso@674 2 --- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
pankso@674 3 +++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
pankso@674 4 @@ -549,7 +549,7 @@
pankso@674 5 ns, ansp, ansp2, nansp2, resplen2);
pankso@674 6 if (n < 0)
pankso@674 7 return (-1);
pankso@674 8 - if (n == 0 && (buf2 == NULL || *resplen2 == 0))
pankso@674 9 + if (n == 0)
pankso@674 10 goto next_ns;
pankso@674 11 } else {
pankso@674 12 /* Use datagrams. */
pankso@674 13 @@ -559,7 +559,7 @@
pankso@674 14 ansp2, nansp2, resplen2);
pankso@674 15 if (n < 0)
pankso@674 16 return (-1);
pankso@674 17 - if (n == 0 && (buf2 == NULL || *resplen2 == 0))
pankso@674 18 + if (n == 0)
pankso@674 19 goto next_ns;
pankso@674 20 if (v_circuit)
pankso@674 21 // XXX Check whether both requests failed or
pankso@674 22 @@ -1275,14 +1275,10 @@
pankso@674 23 (*thisresplenp > *thisanssizp)
pankso@674 24 ? *thisanssizp : *thisresplenp);
pankso@674 25
pankso@674 26 - if (recvresp1 || (buf2 != NULL && recvresp2)) {
pankso@674 27 - *resplen2 = 0;
pankso@674 28 + if (recvresp1 || (buf2 != NULL && recvresp2))
pankso@674 29 return resplen;
pankso@674 30 - }
pankso@674 31 if (buf2 != NULL)
pankso@674 32 {
pankso@674 33 - /* No data from the first reply. */
pankso@674 34 - resplen = 0;
pankso@674 35 /* We are waiting for a possible second reply. */
pankso@674 36 if (hp->id == anhp->id)
pankso@674 37 recvresp1 = 1;