diff options
| -rw-r--r-- | lldb/include/lldb/Interpreter/Args.h | 23 | ||||
| -rw-r--r-- | lldb/source/Interpreter/Args.cpp | 24 |
2 files changed, 16 insertions, 31 deletions
diff --git a/lldb/include/lldb/Interpreter/Args.h b/lldb/include/lldb/Interpreter/Args.h index aa41bc46c7a..2177ef72ebb 100644 --- a/lldb/include/lldb/Interpreter/Args.h +++ b/lldb/include/lldb/Interpreter/Args.h @@ -193,12 +193,8 @@ public: /// /// @param[in] quote_char /// If the argument was originally quoted, put in the quote char here. - /// - /// @return - /// The NULL terminated C string of the copy of \a arg_cstr. //------------------------------------------------------------------ - llvm::StringRef AppendArgument(llvm::StringRef arg_str, - char quote_char = '\0'); + void AppendArgument(llvm::StringRef arg_str, char quote_char = '\0'); void AppendArguments(const Args &rhs); @@ -219,8 +215,8 @@ public: /// @return /// The NULL terminated C string of the copy of \a arg_cstr. //------------------------------------------------------------------ - llvm::StringRef InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str, - char quote_char = '\0'); + void InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str, + char quote_char = '\0'); //------------------------------------------------------------------ /// Replaces the argument value at index \a idx to \a arg_cstr @@ -234,13 +230,9 @@ public: /// /// @param[in] quote_char /// If the argument was originally quoted, put in the quote char here. - /// - /// @return - /// The NULL terminated C string of the copy of \a arg_cstr if - /// \a idx was a valid index, NULL otherwise. //------------------------------------------------------------------ - llvm::StringRef ReplaceArgumentAtIndex(size_t idx, llvm::StringRef arg_str, - char quote_char = '\0'); + void ReplaceArgumentAtIndex(size_t idx, llvm::StringRef arg_str, + char quote_char = '\0'); //------------------------------------------------------------------ /// Deletes the argument value at index @@ -289,11 +281,8 @@ public: /// /// @param[in] quote_char /// If the argument was originally quoted, put in the quote char here. - /// - /// @return - /// A pointer to the copy of \a arg_cstr that was made. //------------------------------------------------------------------ - llvm::StringRef Unshift(llvm::StringRef arg_str, char quote_char = '\0'); + void Unshift(llvm::StringRef arg_str, char quote_char = '\0'); //------------------------------------------------------------------ /// Parse the arguments in the contained arguments. diff --git a/lldb/source/Interpreter/Args.cpp b/lldb/source/Interpreter/Args.cpp index 20c4dd3b510..6653fbb6e5a 100644 --- a/lldb/source/Interpreter/Args.cpp +++ b/lldb/source/Interpreter/Args.cpp @@ -332,8 +332,8 @@ void Args::Shift() { m_entries.erase(m_entries.begin()); } -llvm::StringRef Args::Unshift(llvm::StringRef arg_str, char quote_char) { - return InsertArgumentAtIndex(0, arg_str, quote_char); +void Args::Unshift(llvm::StringRef arg_str, char quote_char) { + InsertArgumentAtIndex(0, arg_str, quote_char); } void Args::AppendArguments(const Args &rhs) { @@ -361,30 +361,28 @@ void Args::AppendArguments(const char **argv) { m_argv.push_back(nullptr); } -llvm::StringRef Args::AppendArgument(llvm::StringRef arg_str, char quote_char) { - return InsertArgumentAtIndex(GetArgumentCount(), arg_str, quote_char); +void Args::AppendArgument(llvm::StringRef arg_str, char quote_char) { + InsertArgumentAtIndex(GetArgumentCount(), arg_str, quote_char); } -llvm::StringRef Args::InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str, - char quote_char) { +void Args::InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str, + char quote_char) { assert(m_argv.size() == m_entries.size() + 1); assert(m_argv.back() == nullptr); if (idx > m_entries.size()) - return llvm::StringRef(); + return; m_entries.emplace(m_entries.begin() + idx, arg_str, quote_char); m_argv.insert(m_argv.begin() + idx, m_entries[idx].data()); - return m_entries[idx].ref; } -llvm::StringRef Args::ReplaceArgumentAtIndex(size_t idx, - llvm::StringRef arg_str, - char quote_char) { +void Args::ReplaceArgumentAtIndex(size_t idx, llvm::StringRef arg_str, + char quote_char) { assert(m_argv.size() == m_entries.size() + 1); assert(m_argv.back() == nullptr); if (idx >= m_entries.size()) - return llvm::StringRef(); + return; if (arg_str.size() > m_entries[idx].ref.size()) { m_entries[idx] = ArgEntry(arg_str, quote_char); @@ -395,8 +393,6 @@ llvm::StringRef Args::ReplaceArgumentAtIndex(size_t idx, m_entries[idx].ptr[arg_str.size()] = 0; m_entries[idx].ref = m_entries[idx].ref.take_front(arg_str.size()); } - - return m_entries[idx].ref; } void Args::DeleteArgumentAtIndex(size_t idx) { |
