projects
/
openvswitch
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
deba43a
)
Fix vlogconf EINTR error returns.
author
Ben Pfaff
<blp@nicira.com>
Thu, 14 Aug 2008 23:18:46 +0000
(16:18 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Thu, 14 Aug 2008 23:18:46 +0000
(16:18 -0700)
Bug #111.
lib/vlog-socket.c
patch
|
blob
|
history
diff --git
a/lib/vlog-socket.c
b/lib/vlog-socket.c
index 49d9589d13482b01b1d98d3bad6994906f0c3eeb..2428bfa6dfb132962108f57aad24aa60b7c46245 100644
(file)
--- a/
lib/vlog-socket.c
+++ b/
lib/vlog-socket.c
@@
-46,6
+46,7
@@
#include "fatal-signal.h"
#include "poll-loop.h"
#include "socket-util.h"
+#include "timeval.h"
#include "util.h"
#include "vlog.h"
@@
-383,11
+384,11
@@
vlog_client_recv(struct vlog_client *client, char **reply)
pfd.fd = client->fd;
pfd.events = POLLIN;
- nfds = poll(&pfd, 1, 1000);
+ nfds =
time_
poll(&pfd, 1, 1000);
if (nfds == 0) {
return ETIMEDOUT;
} else if (nfds < 0) {
- return
errno
;
+ return
-nfds
;
}
nbytes = read(client->fd, buffer, sizeof buffer - 1);