[Lldb-commits] [lldb] r117432 - /lldb/trunk/source/Target/Target.cpp

[Greg Clayton]

Author: gclayton
Date: Tue Oct 26 21:06:37 2010
New Revision: 117432

URL: http://llvm.org/viewvc/llvm-project?rev=117432&view=rev
Log:
After a recent fix to not set the default architecture to "x86_64", the string value for the default arch was coming out as a value that shouldn't be user visible. Now we don't show any value when it isn't set.

Modified:
    lldb/trunk/source/Target/Target.cpp

Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=117432&r1=117431&r2=117432&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Tue Oct 26 21:06:37 2010
@@ -845,10 +845,11 @@
     ModuleSP module_sp = GetExecutableModule();
     if (module_sp)
     {
-        sstr.Printf ("%s_%s", module_sp->GetFileSpec().GetFilename().AsCString(), 
+        sstr.Printf ("%s_%s", 
+                     module_sp->GetFileSpec().GetFilename().AsCString(), 
                      module_sp->GetArchitecture().AsCString());
-	Target::GetSettingsController()->RenameInstanceSettings (GetInstanceName().AsCString(),
-								 sstr.GetData());
+        Target::GetSettingsController()->RenameInstanceSettings (GetInstanceName().AsCString(),
+                                                                 sstr.GetData());
     }
 }
 
@@ -912,7 +913,9 @@
 {
     if (var_name == DefArchVarName())
     {
-        value.AppendString (m_default_architecture.AsCString());
+        // If the arch is invalid (the default), don't show a string for it
+        if (m_default_architecture.IsValid())
+            value.AppendString (m_default_architecture.AsCString());
         return true;
     }
     else