Make GetInstanceSettingsValue methods take an Error * rather than an Error &,
and have them return a bool to indicate success or not.
llvm-svn: 114361
diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h
index e5c424b..bbce71a 100644
--- a/lldb/include/lldb/Core/Debugger.h
+++ b/lldb/include/lldb/Core/Debugger.h
@@ -60,11 +60,11 @@
Error &err,
bool pending);
- void
+ bool
GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err);
+ Error *err);
uint32_t
GetTerminalWidth () const
diff --git a/lldb/include/lldb/Core/UserSettingsController.h b/lldb/include/lldb/Core/UserSettingsController.h
index a6af4bf..af73cb1 100644
--- a/lldb/include/lldb/Core/UserSettingsController.h
+++ b/lldb/include/lldb/Core/UserSettingsController.h
@@ -370,11 +370,11 @@
Error &err,
bool pending) = 0;
- virtual void
+ virtual bool
GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err) = 0;
+ Error *err) = 0;
virtual void
CopyInstanceSettings (const lldb::InstanceSettingsSP &new_settings,
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index e27ce0b..d87bd74 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -69,11 +69,11 @@
Error &err,
bool pending);
- void
+ bool
GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err);
+ Error *err);
const Args &
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index c16f29e..74ebeae 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -56,11 +56,11 @@
Error &err,
bool pending);
- void
+ bool
GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err);
+ Error *err);
protected:
diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h
index 77a892f..627a899 100644
--- a/lldb/include/lldb/Target/Thread.h
+++ b/lldb/include/lldb/Target/Thread.h
@@ -50,11 +50,11 @@
Error &err,
bool pending);
- void
+ bool
GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err);
+ Error *err);
RegularExpression *
GetSymbolsToAvoidRegexp()
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 6bce57a..5ad5227 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -1375,11 +1375,11 @@
}
}
-void
+bool
DebuggerInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err)
+ Error *err)
{
if (var_name == PromptVarName())
{
@@ -1404,7 +1404,12 @@
value.AppendString ("false");
}
else
- err.SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
+ {
+ if (err)
+ err->SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
+ return false;
+ }
+ return true;
}
void
diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp
index 82a58aad..a42dab0 100644
--- a/lldb/source/Core/UserSettingsController.cpp
+++ b/lldb/source/Core/UserSettingsController.cpp
@@ -562,7 +562,7 @@
if (current_settings != NULL)
{
- current_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+ current_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
}
else
{
@@ -575,14 +575,14 @@
if (pos != m_pending_settings.end())
{
lldb::InstanceSettingsSP settings_sp = pos->second;
- settings_sp->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+ settings_sp->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
}
else
{
if (m_settings.level_name.GetLength() > 0)
{
// No valid instance name; assume they want the default settings.
- m_default_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+ m_default_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
}
else
{
@@ -595,7 +595,7 @@
ConstString dbg_name (debugger_instance_name);
InstanceSettings *dbg_settings = FindSettingsForInstance (dbg_name);
if (dbg_settings)
- dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+ dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
}
}
}
@@ -621,7 +621,7 @@
{
var_type = instance_entry->var_type;
if (m_settings.level_name.GetLength() > 0)
- m_default_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+ m_default_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
else
{
// We're at the Debugger level; use the debugger's instance settings.
@@ -633,7 +633,7 @@
ConstString dbg_name (tmp_name.GetData());
InstanceSettings *dbg_settings = FindSettingsForInstance (dbg_name);
if (dbg_settings)
- dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+ dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
}
}
}
@@ -716,7 +716,7 @@
SettingEntry &entry = m_settings.instance_settings[i];
ConstString var_name (entry.var_name);
StringList value;
- m_default_settings->GetInstanceSettingsValue (entry, var_name, value, err);
+ m_default_settings->GetInstanceSettingsValue (entry, var_name, value, NULL);
std::string value_str;
if (value.GetSize() == 1)
@@ -777,8 +777,7 @@
SettingEntry &entry = m_settings.instance_settings[i];
ConstString var_name (entry.var_name);
StringList tmp_value;
- Error err;
- m_default_settings->GetInstanceSettingsValue (entry, var_name, tmp_value, err);
+ m_default_settings->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL);
StreamString value_string;
@@ -817,8 +816,7 @@
SettingEntry &entry = m_settings.instance_settings[i];
ConstString var_name (entry.var_name);
StringList tmp_value;
- Error err;
- settings_sp->GetInstanceSettingsValue (entry, var_name, tmp_value, err);
+ settings_sp->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL);
StreamString value_str;
@@ -884,8 +882,7 @@
SettingEntry &entry = m_settings.instance_settings[i];
const ConstString var_name (entry.var_name);
StringList tmp_value;
- Error err;
- settings->GetInstanceSettingsValue (entry, var_name, tmp_value, err);
+ settings->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL);
StreamString tmp_value_str;
if (tmp_value.GetSize() == 0)
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 2f676ca..6c26405 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -1988,11 +1988,11 @@
m_disable_aslr = new_process_settings->m_disable_aslr;
}
-void
+bool
ProcessInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err)
+ Error *err)
{
if (var_name == RunArgsVarName())
{
@@ -2039,7 +2039,12 @@
value.AppendString ("false");
}
else
- err.SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
+ {
+ if (err)
+ err->SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
+ return false;
+ }
+ return true;
}
const ConstString
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index f67c8ce..207eb5c 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -934,11 +934,11 @@
// Currently 'target' does not have any instance settings.
}
-void
+bool
TargetInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err)
+ Error *err)
{
// Currently 'target' does not have any instance settings.
}
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
index 21eb2d4..cd4f824 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -1062,11 +1062,11 @@
m_avoid_regexp_ap.reset ();
}
-void
+bool
ThreadInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
const ConstString &var_name,
StringList &value,
- Error &err)
+ Error *err)
{
if (var_name == StepAvoidRegexpVarName())
{
@@ -1080,7 +1080,12 @@
}
else
- err.SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
+ {
+ if (err)
+ err->SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
+ return false;
+ }
+ return true;
}
const ConstString
