refresh (create temporary patch)

diff --git a/meta b/meta
index 3378f0adce046a878928d8de302e3ab97973df68..3a51d3bf6ff98deaccd96c7e065623bf2b66207e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 5a98170a18d3b302a1158e0f5b971093a4d24394
-Head: e633944d0a9d3a680904ab64fa1b092861b8e6d9
+Previous: 8234eca48740fda98685ed482263df8fee601867
+Head: 530c1dab05eacc006bc30eaefb0d310c42268348
 Applied:
   test-udp: e633944d0a9d3a680904ab64fa1b092861b8e6d9
+  refresh-temp: 530c1dab05eacc006bc30eaefb0d310c42268348
 Unapplied:
   usocket: 158ea5a8c1a0fcf3ca61c642095023af16759c90
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..7422cf0
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,33 @@
+Bottom: 3bb2d5c4840cc0d59a5a500ba614c6001a92dc00
+Top:    d3cf6446fd6282f1865b0aab7918b786da23eafb
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-11-15 22:46:17 -0800
+
+Refresh of test-udp
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 2d44848..01f0b0e 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -660,8 +660,8 @@ ssize_t recv(int socket, void *buf, size_t len, int flags)
+ {
+       int fd;
+       struct sockaddr sa;
+-      socklen_t len = sizeof sa;
+-      real.recvfrom(socket, buf, len, flags, &sa, &len);
++      socklen_t slen = sizeof sa;
++      real.recvfrom(socket, buf, len, flags, &sa, &slen);
+       return (fd_fork_get(socket, &fd) == fd_rsocket) ?
+               rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
+ }
+@@ -775,7 +775,7 @@ use_rpoll:
+               rfds[i].fd = fd_getd(fds[i].fd);
+               rfds[i].events = fds[i].events;
+               rfds[i].revents = 0;
+-              real.poll(&fds[i], 1, timeout);
++              real.poll(&fds[i], 1, 0);
+       }
+ 
+       ret = rpoll(rfds, nfds, timeout);