Remember whether a queue or thread name were passed into "breakpoint modify" so we can recognize an empty argument as unsetting the option.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@106377 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Commands/CommandObjectBreakpoint.cpp b/source/Commands/CommandObjectBreakpoint.cpp
index bbefb2c..044ff40 100644
--- a/source/Commands/CommandObjectBreakpoint.cpp
+++ b/source/Commands/CommandObjectBreakpoint.cpp
@@ -1095,10 +1095,18 @@
}
break;
case 'T':
- m_thread_name = option_arg;
+ if (option_arg != NULL)
+ m_thread_name = option_arg;
+ else
+ m_thread_name.clear();
+ m_name_passed = true;
break;
case 'q':
- m_queue_name = option_arg;
+ if (option_arg != NULL)
+ m_queue_name = option_arg;
+ else
+ m_queue_name.clear();
+ m_queue_passed = true;
break;
case 'x':
{
@@ -1127,6 +1135,8 @@
m_thread_name.clear();
m_queue_name.clear();
m_enable_passed = false;
+ m_queue_passed = false;
+ m_name_passed = false;
}
//-------------------------------------------------------------------------
@@ -1201,10 +1211,10 @@
if (m_options.m_thread_index != -1)
location->GetLocationOptions()->GetThreadSpec()->SetIndex(m_options.m_thread_index);
- if (!m_options.m_thread_name.empty())
+ if (m_options.m_name_passed)
location->GetLocationOptions()->GetThreadSpec()->SetName(m_options.m_thread_name.c_str());
- if (!m_options.m_queue_name.empty())
+ if (m_options.m_queue_passed)
location->GetLocationOptions()->GetThreadSpec()->SetQueueName(m_options.m_queue_name.c_str());
if (m_options.m_ignore_count != -1)
@@ -1222,10 +1232,10 @@
if (m_options.m_thread_index != -1)
bp->GetOptions()->GetThreadSpec()->SetIndex(m_options.m_thread_index);
- if (!m_options.m_thread_name.empty())
+ if (m_options.m_name_passed)
bp->GetOptions()->GetThreadSpec()->SetName(m_options.m_thread_name.c_str());
- if (!m_options.m_queue_name.empty())
+ if (m_options.m_queue_passed)
bp->GetOptions()->GetThreadSpec()->SetQueueName(m_options.m_queue_name.c_str());
if (m_options.m_ignore_count != -1)
diff --git a/source/Commands/CommandObjectBreakpoint.h b/source/Commands/CommandObjectBreakpoint.h
index 5374146..053e036 100644
--- a/source/Commands/CommandObjectBreakpoint.h
+++ b/source/Commands/CommandObjectBreakpoint.h
@@ -172,6 +172,8 @@
std::string m_queue_name;
bool m_enable_passed;
bool m_enable_value;
+ bool m_name_passed;
+ bool m_queue_passed;
};