Author: tjansen Date: Thu Nov 12 14:43:40 2009 New Revision: 1670 Log: Merged two lines: socket() and the fail check. Modified: trunk/libpisa/tunnel.c Modified: trunk/libpisa/tunnel.c ============================================================================== --- trunk/libpisa/tunnel.c Thu Nov 12 14:38:29 2009 (r1669) +++ trunk/libpisa/tunnel.c Thu Nov 12 14:43:40 2009 (r1670) @@ -135,9 +135,7 @@ int fd_peer, on = 1; struct sockaddr_in6 sin; - fd_peer = socket(AF_INET6, SOCK_DGRAM, 0); - - if (fd_peer < 0) + if ((fd_peer = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) die("pisa_tunnel_open_socket: socket creation failed", 4); setsockopt(fd_peer, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));