From: Ben Pfaff <blp@nicira.com> Date: Fri, 1 Feb 2013 22:54:15 +0000 (-0800) Subject: socket-util: Use set_nonblocking() helper function. X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~89 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b36db1148939c1ca7af3c3973252fea3fbf1c4e6;p=sliver-openvswitch.git socket-util: Use set_nonblocking() helper function. There's no reason to inline this when we have a helper for it. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Ethan Jackson <ethan@nicira.com> --- diff --git a/lib/socket-util.c b/lib/socket-util.c index 3e3c67fe1..9fea7bdab 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -409,13 +409,8 @@ make_unix_socket(int style, bool nonblock, * it will only happen if style is SOCK_STREAM or SOCK_SEQPACKET, and only * if a backlog of un-accepted connections has built up in the kernel.) */ if (nonblock) { - int flags = fcntl(fd, F_GETFL, 0); - if (flags == -1) { - error = errno; - goto error; - } - if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) { - error = errno; + error = set_nonblocking(fd); + if (error) { goto error; } }