intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-17 06:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure if an enumeration "settings" value has a valid default setting in

Browse Source 
its definition, that the first enumeration doesn't always get used as the
default.

llvm-svn: 132289
This commit is contained in:
Greg Clayton
2011-05-29 19:21:37 +00:00
parent a3bb03e400
commit 18d85eedda
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lldb/source/Core/UserSettingsController.cpp
View File

@@ -727,21 +727,23 @@ void
UserSettingsController::CreateDefaultInstanceSettings ()
{
Error err;
const ConstString &default_name = InstanceSettings::GetDefaultName();
const ConstString &default_instance_name = InstanceSettings::GetDefaultName();
for (int i = 0; i < m_settings.instance_settings.size(); ++i)
{
SettingEntry &entry = m_settings.instance_settings[i];
ConstString var_name (entry.var_name);
const char *value = entry.default_value;
const char *default_value = entry.default_value;
if (entry.var_type == eSetVarTypeEnum)
value = entry.enum_values[0].string_value;
// If there is no default value, then use the first enumeration value
// as the default value
if (default_value == NULL && entry.var_type == eSetVarTypeEnum)
default_value = entry.enum_values[0].string_value;
if (value != NULL)
if (default_value != NULL)
m_default_settings->UpdateInstanceSettingsVariable (var_name,
NULL,
value,
default_name,
default_value,
default_instance_name,
entry,
eVarSetOperationAssign,
err,