Make GetInstanceSettingsValue methods take an Error * rather than an Error &,

and have them return a bool to indicate success or not.

llvm-svn: 114361

3 files changed, 18 insertions, 8 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 2f676ca31d7..6c264051742 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -1988,11 +1988,11 @@ ProcessInstanceSettings::CopyInstanceSettings (const lldb::InstanceSettingsSP &n
     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 @@ ProcessInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
             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 f67c8cef692..207eb5c4445 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -934,11 +934,11 @@ TargetInstanceSettings::CopyInstanceSettings (const lldb::InstanceSettingsSP &ne
     // 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 21eb2d4b77b..cd4f8247c3d 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -1062,11 +1062,11 @@ ThreadInstanceSettings::CopyInstanceSettings (const lldb::InstanceSettingsSP &ne
         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 @@ ThreadInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
 
     }
     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