Fixed a ton of gcc compile warnings

Removed some unused variables, added some consts, changed some casts
to const_cast. I don't think any of these changes are very
controversial.

Differential Revision: http://reviews.llvm.org/D9674

llvm-svn: 237218

1 files changed, 23 insertions, 31 deletions

diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index 89d9876..fbd2047 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -772,48 +772,40 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
         llvm::SmallString<PATH_MAX> named_pipe_path;
         Pipe port_pipe;
 
-        bool listen = false;
-        if (host_and_port[0])
+        if (host_and_port[0] && in_port == 0)
         {
             // Create a temporary file to get the stdout/stderr and redirect the
             // output of the command into this file. We will later read this file
             // if all goes well and fill the data into "command_output_ptr"
 
-            if (in_port == 0)
+            // Binding to port zero, we need to figure out what port it ends up
+            // using using a named pipe...
+            error = port_pipe.CreateWithUniqueName("debugserver-named-pipe", false, named_pipe_path);
+            if (error.Success())
             {
-                // Binding to port zero, we need to figure out what port it ends up
-                // using using a named pipe...
-                error = port_pipe.CreateWithUniqueName("debugserver-named-pipe", false, named_pipe_path);
-                if (error.Success())
-                {
-                    debugserver_args.AppendArgument("--named-pipe");
-                    debugserver_args.AppendArgument(named_pipe_path.c_str());
-                }
-                else
+                debugserver_args.AppendArgument("--named-pipe");
+                debugserver_args.AppendArgument(named_pipe_path.c_str());
+            }
+            else
+            {
+                if (log)
+                    log->Printf("GDBRemoteCommunication::%s() "
+                            "named pipe creation failed: %s",
+                            __FUNCTION__, error.AsCString());
+                // let's try an unnamed pipe
+                error = port_pipe.CreateNew(true);
+                if (error.Fail())
                 {
                     if (log)
                         log->Printf("GDBRemoteCommunication::%s() "
-                                "named pipe creation failed: %s",
+                                "unnamed pipe creation failed: %s",
                                 __FUNCTION__, error.AsCString());
-                    // let's try an unnamed pipe
-                    error = port_pipe.CreateNew(true);
-                    if (error.Fail())
-                    {
-                        if (log)
-                            log->Printf("GDBRemoteCommunication::%s() "
-                                    "unnamed pipe creation failed: %s",
-                                    __FUNCTION__, error.AsCString());
-                        return error;
-                    }
-                    int write_fd = port_pipe.GetWriteFileDescriptor();
-                    debugserver_args.AppendArgument("--pipe");
-                    debugserver_args.AppendArgument(std::to_string(write_fd).c_str());
-                    launch_info.AppendCloseFileAction(port_pipe.GetReadFileDescriptor());
+                    return error;
                 }
-            }
-            else
-            {
-                listen = true;
+                int write_fd = port_pipe.GetWriteFileDescriptor();
+                debugserver_args.AppendArgument("--pipe");
+                debugserver_args.AppendArgument(std::to_string(write_fd).c_str());
+                launch_info.AppendCloseFileAction(port_pipe.GetReadFileDescriptor());
             }
         }
         else