diff options
author | David Spickett <david.spickett@linaro.org> | 2021-06-17 12:32:23 +0100 |
---|---|---|
committer | David Spickett <david.spickett@linaro.org> | 2021-06-17 14:39:35 +0100 |
commit | eaf60a4411f79a1addfa6c5d8ddf4b47e082881e (patch) | |
tree | 8ea76ea64b562f4386e0ce802a430a1292f5da89 /lldb/source/Commands/CommandObjectPlatform.cpp | |
parent | 3f596842e3d25009c4d62c75e5b24b515bde8e93 (diff) | |
download | llvm-eaf60a4411f79a1addfa6c5d8ddf4b47e082881e.zip llvm-eaf60a4411f79a1addfa6c5d8ddf4b47e082881e.tar.gz llvm-eaf60a4411f79a1addfa6c5d8ddf4b47e082881e.tar.bz2 |
[lldb] Remove redundant calls to set eReturnStatusFailed
This is part 2, covering the commands source.
Some uses remain where it's tricky to see what the
logic is or they are not used with AppendError.
Reviewed By: teemperor
Differential Revision: https://reviews.llvm.org/D104448
Diffstat (limited to 'lldb/source/Commands/CommandObjectPlatform.cpp')
-rw-r--r-- | lldb/source/Commands/CommandObjectPlatform.cpp | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index b95b1c3..16fe05a 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -180,16 +180,13 @@ protected: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("invalid platform name"); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError( "platform create takes a platform name as an argument\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -232,7 +229,6 @@ protected: if (idx == 0) { result.AppendError("no platforms are available\n"); - result.SetStatus(eReturnStatusFailed); } else result.SetStatus(eReturnStatusSuccessFinishResult); return result.Succeeded(); @@ -266,7 +262,6 @@ protected: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError("no platform is currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -298,15 +293,12 @@ protected: platform_sp->ConnectToWaitingProcesses(GetDebugger(), error); if (error.Fail()) { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendErrorWithFormat("%s\n", error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform is currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -361,24 +353,20 @@ protected: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendErrorWithFormat("%s", error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { // Not connected... result.AppendErrorWithFormat( "not connected to '%s'", platform_sp->GetPluginName().GetCString()); - result.SetStatus(eReturnStatusFailed); } } else { // Bad args result.AppendError( "\"platform disconnect\" doesn't take any arguments"); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform is currently selected"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -412,7 +400,6 @@ protected: m_option_working_dir.GetOptionValue().GetCurrentValue()); } else { result.AppendError("no platform is currently selected"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -457,11 +444,9 @@ public: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -521,11 +506,9 @@ public: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -560,7 +543,6 @@ public: if (!llvm::to_integer(cmd_line, fd)) { result.AppendErrorWithFormatv("'{0}' is not a valid file descriptor.\n", cmd_line); - result.SetStatus(eReturnStatusFailed); return result.Succeeded(); } Status error; @@ -570,11 +552,9 @@ public: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -605,7 +585,6 @@ public: if (!llvm::to_integer(cmd_line, fd)) { result.AppendErrorWithFormatv("'{0}' is not a valid file descriptor.\n", cmd_line); - result.SetStatus(eReturnStatusFailed); return result.Succeeded(); } std::string buffer(m_options.m_count, 0); @@ -617,7 +596,6 @@ public: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -698,7 +676,6 @@ public: if (!llvm::to_integer(cmd_line, fd)) { result.AppendErrorWithFormatv("'{0}' is not a valid file descriptor.", cmd_line); - result.SetStatus(eReturnStatusFailed); return result.Succeeded(); } uint32_t retcode = @@ -708,7 +685,6 @@ public: result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -866,11 +842,9 @@ public: } else { result.AppendMessageWithFormat("get-file failed: %s\n", error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -941,11 +915,9 @@ public: result.AppendMessageWithFormat( "Error getting file size of %s (remote)\n", remote_file_path.c_str()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -991,11 +963,9 @@ public: result.SetStatus(eReturnStatusSuccessFinishNoResult); } else { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform currently selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -1073,12 +1043,10 @@ protected: result.AppendError("process launch failed"); else result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } else { result.AppendError("'platform process launch' uses the current target " "file and arguments, or the executable and its " "arguments can be specified in this command"); - result.SetStatus(eReturnStatusFailed); return false; } } else { @@ -1140,7 +1108,6 @@ protected: } else { result.AppendErrorWithFormat( "no process found with pid = %" PRIu64 "\n", pid); - result.SetStatus(eReturnStatusFailed); } } else { ProcessInstanceInfoList proc_infos; @@ -1182,7 +1149,6 @@ protected: result.AppendErrorWithFormat( "no processes were found on the \"%s\" platform\n", platform_sp->GetPluginName().GetCString()); - result.SetStatus(eReturnStatusFailed); } else { result.AppendMessageWithFormat( "%u matching process%s found on \"%s\"", matches, @@ -1204,11 +1170,9 @@ protected: } } else { result.AppendError("invalid args: process list takes only options\n"); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform is selected\n"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -1413,7 +1377,6 @@ protected: if (entry.ref().getAsInteger(0, pid)) { result.AppendErrorWithFormat("invalid process ID argument '%s'", entry.ref().str().c_str()); - result.SetStatus(eReturnStatusFailed); break; } else { ProcessInstanceInfo proc_info; @@ -1434,16 +1397,13 @@ protected: result.AppendErrorWithFormat( "not connected to '%s'", platform_sp->GetPluginName().GetCString()); - result.SetStatus(eReturnStatusFailed); } } else { // No args result.AppendError("one or more process id(s) must be specified"); - result.SetStatus(eReturnStatusFailed); } } else { result.AppendError("no platform is currently selected"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -1532,15 +1492,12 @@ public: m_options.attach_info, GetDebugger(), nullptr, err); if (err.Fail()) { result.AppendError(err.AsCString()); - result.SetStatus(eReturnStatusFailed); } else if (!remote_process_sp) { result.AppendError("could not attach: unknown reason"); - result.SetStatus(eReturnStatusFailed); } else result.SetStatus(eReturnStatusSuccessFinishResult); } else { result.AppendError("no platform is currently selected"); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } @@ -1718,7 +1675,6 @@ public: if (error.Fail()) { result.AppendError(error.AsCString()); - result.SetStatus(eReturnStatusFailed); } else { result.SetStatus(eReturnStatusSuccessFinishResult); } @@ -1752,7 +1708,6 @@ public: bool DoExecute(Args &args, CommandReturnObject &result) override { if (args.GetArgumentCount() != 2) { result.AppendError("platform target-install takes two arguments"); - result.SetStatus(eReturnStatusFailed); return false; } // TODO: move the bulk of this code over to the platform itself @@ -1761,14 +1716,12 @@ public: FileSpec dst(args.GetArgumentAtIndex(1)); if (!FileSystem::Instance().Exists(src)) { result.AppendError("source location does not exist or is not accessible"); - result.SetStatus(eReturnStatusFailed); return false; } PlatformSP platform_sp( GetDebugger().GetPlatformList().GetSelectedPlatform()); if (!platform_sp) { result.AppendError("no platform currently selected"); - result.SetStatus(eReturnStatusFailed); return false; } @@ -1777,7 +1730,6 @@ public: result.SetStatus(eReturnStatusSuccessFinishNoResult); } else { result.AppendErrorWithFormat("install failed: %s", error.AsCString()); - result.SetStatus(eReturnStatusFailed); } return result.Succeeded(); } |