Merge branch 'master' into pr_syscall_linux

1 files changed, 4 insertions, 6 deletions

diff --git a/test/syscalls/linux/socket_test_util.cc b/test/syscalls/linux/socket_test_util.cc
index 3c716235b..eff7d577e 100644
--- a/test/syscalls/linux/socket_test_util.cc
+++ b/test/syscalls/linux/socket_test_util.cc
@@ -588,8 +588,9 @@ ssize_t SendLargeSendMsg(const std::unique_ptr<SocketPair>& sockets,
   return RetryEINTR(sendmsg)(sockets->first_fd(), &msg, 0);
 }
 
-PosixErrorOr<int> PortAvailable(int port, AddressFamily family, SocketType type,
-                                bool reuse_addr) {
+namespace internal {
+PosixErrorOr<int> TryPortAvailable(int port, AddressFamily family,
+                                   SocketType type, bool reuse_addr) {
   if (port < 0) {
     return PosixError(EINVAL, "Invalid port");
   }
@@ -664,10 +665,7 @@ PosixErrorOr<int> PortAvailable(int port, AddressFamily family, SocketType type,
 
   return available_port;
 }
-
-PosixError FreeAvailablePort(int port) {
-  return NoError();
-}
+}  // namespace internal
 
 PosixErrorOr<int> SendMsg(int sock, msghdr* msg, char buf[], int buf_size) {
   struct iovec iov;