Address code review comments

Author: emrekultursay

lldb/include/lldb/Host/posix/DomainSocket.h

@@ -31,7 +31,8 @@ class DomainSocket : public Socket {
 
   std::vector<std::string> GetListeningConnectionURI() const override;
 
-  static Socket *Create(NativeSocket sockfd, bool should_close, Status &error);
+  static llvm::Expected<std::unique_ptr<DomainSocket>>
+  FromBoundNativeSocket(NativeSocket sockfd, bool should_close);
 
 protected:
   DomainSocket(SocketProtocol protocol);

lldb/source/Host/posix/DomainSocket.cpp

@@ -192,21 +192,19 @@ std::vector<std::string> DomainSocket::GetListeningConnectionURI() const {
   return {llvm::formatv("unix-connect://{0}", addr.sun_path)};
 }
 
-Socket *DomainSocket::Create(NativeSocket sockfd, bool should_close,
-                             Status &error) {
+llvm::Expected<std::unique_ptr<DomainSocket>>
+DomainSocket::FromBoundNativeSocket(NativeSocket sockfd, bool should_close) {
 #ifdef __linux__
   // Check if fd represents domain socket or abstract socket.
   struct sockaddr_un addr;
   socklen_t addr_len = sizeof(addr);
-  if (getsockname(sockfd, (struct sockaddr *)&addr, &addr_len) == -1) {
-    error = Status::FromErrorString(
-        "lldb-platform child: not a socket or error occurred");
-    return nullptr;
-  }
-
-  if (addr.sun_family == AF_UNIX && addr.sun_path[0] == '\0') {
-    return new AbstractSocket(sockfd, should_close);
-  }
+  if (getsockname(sockfd, (struct sockaddr *)&addr, &addr_len) == -1)
+    return llvm::createStringError("not a socket or error occurred");
+  if (addr.sun_family != AF_UNIX)
+    return llvm::createStringError("Bad socket type");
+  if (addr_len > offsetof(struct sockaddr_un, sun_path) &&
+      addr.sun_path[0] == '\0')
+    return std::make_unique<AbstractSocket>(sockfd, should_close);
 #endif
-  return new DomainSocket(sockfd, should_close);
-}
+  return std::make_unique<DomainSocket>(sockfd, should_close);
+}

lldb/tools/lldb-server/lldb-platform.cpp

@@ -465,21 +465,23 @@ int main_platform(int argc, char *argv[]) {
       return socket_error;
     }
 
-    Socket *socket;
+    std::unique_ptr<Socket> socket;
     if (gdbserver_port) {
-      socket = new TCPSocket(sockfd, /*should_close=*/true);
+      socket = std::make_unique<TCPSocket>(sockfd, /*should_close=*/true);
     } else {
-      socket = DomainSocket::Create(sockfd, /*should_close=*/true, error);
-      if (error.Fail()) {
+      llvm::Expected<std::unique_ptr<DomainSocket>> domain_socket =
+          DomainSocket::FromBoundNativeSocket(sockfd, /*should_close=*/true);
+      if (!domain_socket) {
         LLDB_LOGF(log, "Failed to create socket: %s\n", error.AsCString());
         return socket_error;
       }
+      socket = std::move(domain_socket.get());
     }
 
-    Socket::SocketProtocol protocol = socket->GetSocketProtocol();
-    GDBRemoteCommunicationServerPlatform platform(protocol, gdbserver_port);
-    platform.SetConnection(
-        std::unique_ptr<Connection>(new ConnectionFileDescriptor(socket)));
+    GDBRemoteCommunicationServerPlatform platform(socket->GetSocketProtocol(),
+                                                  gdbserver_port);
+    platform.SetConnection(std::unique_ptr<Connection>(
+        new ConnectionFileDescriptor(socket.release())));
     client_handle(platform, inferior_arguments);
     return 0;
   }
@@ -492,7 +494,7 @@ int main_platform(int argc, char *argv[]) {
     return 1;
   }
 
-  Socket::SocketProtocol protocol;
+  Socket::SocketProtocol protocol = Socket::ProtocolUnixDomain;
   std::string address;
   std::string gdb_address;
   uint16_t platform_port = 0;