diff options
| author | Zachary Turner <zturner@google.com> | 2016-11-12 16:56:47 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-11-12 16:56:47 +0000 |
| commit | fe11483b57c1dc6a6758725e6de0d6804ec59ed1 (patch) | |
| tree | af50255449e1a57e1a528735cfa3458a5e9e66d2 /lldb/source/Commands/CommandObjectWatchpoint.cpp | |
| parent | c351fb16079ae8c88e868960829107a823a86246 (diff) | |
| download | bcm5719-llvm-fe11483b57c1dc6a6758725e6de0d6804ec59ed1.tar.gz bcm5719-llvm-fe11483b57c1dc6a6758725e6de0d6804ec59ed1.zip | |
Make Options::SetOptionValue take a StringRef.
llvm-svn: 286723
Diffstat (limited to 'lldb/source/Commands/CommandObjectWatchpoint.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectWatchpoint.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index 5979130853d..f143f5ff28d 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -197,7 +197,7 @@ public: ~CommandOptions() override = default; - Error SetOptionValue(uint32_t option_idx, const char *option_arg, + Error SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, ExecutionContext *execution_context) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -561,17 +561,16 @@ public: ~CommandOptions() override = default; - Error SetOptionValue(uint32_t option_idx, const char *option_arg, + Error SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, ExecutionContext *execution_context) override { Error error; const int short_option = m_getopt_table[option_idx].val; switch (short_option) { case 'i': - m_ignore_count = StringConvert::ToUInt32(option_arg, UINT32_MAX, 0); - if (m_ignore_count == UINT32_MAX) + if (option_arg.getAsInteger(0, m_ignore_count)) error.SetErrorStringWithFormat("invalid ignore count '%s'", - option_arg); + option_arg.str().c_str()); break; default: error.SetErrorStringWithFormat("unrecognized option '%c'", @@ -690,17 +689,14 @@ public: ~CommandOptions() override = default; - Error SetOptionValue(uint32_t option_idx, const char *option_arg, + Error SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg, ExecutionContext *execution_context) override { Error error; const int short_option = m_getopt_table[option_idx].val; switch (short_option) { case 'c': - if (option_arg != nullptr) - m_condition.assign(option_arg); - else - m_condition.clear(); + m_condition = option_arg; m_condition_passed = true; break; default: |
