static int make_listen_fd(const struct addrinfo *addrinfo)
{
- int saved_errno, fd, on = 1;
+ int fd, on = 1;
fd = socket(addrinfo->ai_family, addrinfo->ai_socktype,
addrinfo->ai_protocol);
if (fd < 0)
return -1;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)
+ goto fail;
+
if (bind(fd, addrinfo->ai_addr, addrinfo->ai_addrlen) != 0)
goto fail;
return fd;
fail:
- saved_errno = errno;
- close(fd);
- errno = saved_errno;
+ close_noerr(fd);
return -1;
}