diff options
Diffstat (limited to 'lldb/source/Core')
| -rw-r--r-- | lldb/source/Core/Debugger.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Core/ModuleList.cpp | 14 | ||||
| -rw-r--r-- | lldb/source/Core/RegisterValue.cpp | 26 | ||||
| -rw-r--r-- | lldb/source/Core/Scalar.cpp | 26 | ||||
| -rw-r--r-- | lldb/source/Core/UserSettingsController.cpp | 68 | ||||
| -rw-r--r-- | lldb/source/Core/ValueObjectChild.cpp | 4 |
6 files changed, 71 insertions, 73 deletions
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index 45c0653b9d8..dac85c72bba 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -2160,7 +2160,7 @@ DebuggerInstanceSettings::ValidTermWidthValue (const char *value, Error err) // Verify we have a value string. if (value == NULL || value[0] == '\0') { - err.SetErrorString ("Missing value. Can't set terminal width without a value.\n"); + err.SetErrorString ("missing value, can't set terminal width without a value"); } else { @@ -2172,10 +2172,10 @@ DebuggerInstanceSettings::ValidTermWidthValue (const char *value, Error err) if (width >= 10 && width <= 1024) valid = true; else - err.SetErrorString ("Invalid term-width value; value must be between 10 and 1024.\n"); + err.SetErrorString ("invalid term-width value; value must be between 10 and 1024"); } else - err.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string.\n", value); + err.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string", value); } return valid; diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp index f3a2f0fbfa6..d5cf9ab4566 100644 --- a/lldb/source/Core/ModuleList.cpp +++ b/lldb/source/Core/ModuleList.cpp @@ -866,14 +866,14 @@ ModuleList::GetSharedModule if (arch.IsValid()) { if (uuid_cstr[0]) - error.SetErrorStringWithFormat("'%s' does not contain the %s architecture and UUID %s.\n", path, arch.GetArchitectureName(), uuid_cstr); + error.SetErrorStringWithFormat("'%s' does not contain the %s architecture and UUID %s", path, arch.GetArchitectureName(), uuid_cstr); else - error.SetErrorStringWithFormat("'%s' does not contain the %s architecture.\n", path, arch.GetArchitectureName()); + error.SetErrorStringWithFormat("'%s' does not contain the %s architecture.", path, arch.GetArchitectureName()); } } else { - error.SetErrorStringWithFormat("'%s' does not exist.\n", path); + error.SetErrorStringWithFormat("'%s' does not exist", path); } return error; } @@ -930,9 +930,9 @@ ModuleList::GetSharedModule if (file_spec) { if (arch.IsValid()) - error.SetErrorStringWithFormat("Unable to open %s architecture in '%s'.\n", arch.GetArchitectureName(), path); + error.SetErrorStringWithFormat("unable to open %s architecture in '%s'", arch.GetArchitectureName(), path); else - error.SetErrorStringWithFormat("Unable to open '%s'.\n", path); + error.SetErrorStringWithFormat("unable to open '%s'", path); } else { @@ -942,9 +942,9 @@ ModuleList::GetSharedModule uuid_cstr[0] = '\0'; if (uuid_cstr[0]) - error.SetErrorStringWithFormat("Cannot locate a module for UUID '%s'.\n", uuid_cstr); + error.SetErrorStringWithFormat("cannot locate a module for UUID '%s'", uuid_cstr); else - error.SetErrorStringWithFormat("Cannot locate a module.\n"); + error.SetErrorStringWithFormat("cannot locate a module"); } } } diff --git a/lldb/source/Core/RegisterValue.cpp b/lldb/source/Core/RegisterValue.cpp index 3dac05c2b21..e3c34fda82a 100644 --- a/lldb/source/Core/RegisterValue.cpp +++ b/lldb/source/Core/RegisterValue.cpp @@ -392,18 +392,18 @@ RegisterValue::SetValueFromCString (const RegisterInfo *reg_info, const char *va { uint64_t uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 0, &success); if (!success) - error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value", value_str); else if (!Args::UInt64ValueIsValidForByteSize (uval64, byte_size)) - error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte unsigned integer value.\n", uval64, byte_size); + error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte unsigned integer value", uval64, byte_size); else { if (!SetUInt (uval64, reg_info->byte_size)) - error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size); } } else { - error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size); return error; } break; @@ -413,18 +413,18 @@ RegisterValue::SetValueFromCString (const RegisterInfo *reg_info, const char *va { uint64_t sval64 = Args::StringToSInt64(value_str, INT64_MAX, 0, &success); if (!success) - error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value", value_str); else if (!Args::SInt64ValueIsValidForByteSize (sval64, byte_size)) - error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte signed integer value.\n", sval64, byte_size); + error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte signed integer value", sval64, byte_size); else { if (!SetUInt (sval64, reg_info->byte_size)) - error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size); } } else { - error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size); return error; } break; @@ -435,31 +435,31 @@ RegisterValue::SetValueFromCString (const RegisterInfo *reg_info, const char *va if (::sscanf (value_str, "%f", &m_data.ieee_float) == 1) m_type = eTypeFloat; else - error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str); } else if (byte_size == sizeof (double)) { if (::sscanf (value_str, "%lf", &m_data.ieee_double) == 1) m_type = eTypeDouble; else - error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str); } else if (byte_size == sizeof (long double)) { if (::sscanf (value_str, "%Lf", &m_data.ieee_long_double) == 1) m_type = eTypeLongDouble; else - error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str); } else { - error.SetErrorStringWithFormat ("Unsupported float byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported float byte size: %u", byte_size); return error; } break; case eEncodingVector: - error.SetErrorString ("Vector encoding unsupported."); + error.SetErrorString ("vector encoding unsupported."); break; } if (error.Fail()) diff --git a/lldb/source/Core/Scalar.cpp b/lldb/source/Core/Scalar.cpp index 70be568d3e4..f5ba15f1c7c 100644 --- a/lldb/source/Core/Scalar.cpp +++ b/lldb/source/Core/Scalar.cpp @@ -1829,9 +1829,9 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, uint32_t { uint64_t uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 0, &success); if (!success) - error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value", value_str); else if (!UIntValueIsValidForSize (uval64, byte_size)) - error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte unsigned integer value.\n", uval64, byte_size); + error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte unsigned integer value", uval64, byte_size); else { m_type = Scalar::GetValueTypeForUnsignedIntegerWithByteSize (byte_size); @@ -1841,14 +1841,14 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, uint32_t case e_ulong: m_data.ulong = uval64; break; case e_ulonglong: m_data.ulonglong = uval64; break; default: - error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size); break; } } } else { - error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size); return error; } break; @@ -1858,9 +1858,9 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, uint32_t { uint64_t sval64 = Args::StringToSInt64(value_str, INT64_MAX, 0, &success); if (!success) - error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value", value_str); else if (!SIntValueIsValidForSize (sval64, byte_size)) - error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte signed integer value.\n", sval64, byte_size); + error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte signed integer value", sval64, byte_size); else { m_type = Scalar::GetValueTypeForSignedIntegerWithByteSize (byte_size); @@ -1870,14 +1870,14 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, uint32_t case e_slong: m_data.slong = sval64; break; case e_slonglong: m_data.slonglong = sval64; break; default: - error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size); break; } } } else { - error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size); return error; } break; @@ -1888,31 +1888,31 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, uint32_t if (::sscanf (value_str, "%f", &m_data.flt) == 1) m_type = e_float; else - error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str); } else if (byte_size == sizeof (double)) { if (::sscanf (value_str, "%lf", &m_data.dbl) == 1) m_type = e_double; else - error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str); } else if (byte_size == sizeof (long double)) { if (::sscanf (value_str, "%Lf", &m_data.ldbl) == 1) m_type = e_long_double; else - error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str); + error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str); } else { - error.SetErrorStringWithFormat ("Unsupported float byte size: %u.\n", byte_size); + error.SetErrorStringWithFormat ("unsupported float byte size: %u", byte_size); return error; } break; case eEncodingVector: - error.SetErrorString ("Vector encoding unsupported."); + error.SetErrorString ("vector encoding unsupported."); break; } if (error.Fail()) diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp index a33b9154c78..91e4f0beb30 100644 --- a/lldb/source/Core/UserSettingsController.cpp +++ b/lldb/source/Core/UserSettingsController.cpp @@ -285,7 +285,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, if (num_pieces < 1) { - err.SetErrorStringWithFormat ("'%s' is not a valid variable name; cannot assign value.\n", full_dot_name); + err.SetErrorStringWithFormat ("'%s' is not a valid variable name; cannot assign value", full_dot_name); return err; } @@ -303,7 +303,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, if (num_pieces == 0) { - err.SetErrorString ("No variable name specified; cannot assign value.\n"); + err.SetErrorString ("no variable name specified, cannot assign value"); return err; } else if (num_pieces == 1) @@ -337,7 +337,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, entry = GetInstanceEntry (const_var_name); if (entry == NULL) { - err.SetErrorStringWithFormat ("Unable to find variable '%s.%s'; cannot assign value.\n", + err.SetErrorStringWithFormat ("unable to find variable '%s.%s', cannot assign value", prefix.GetCString(), const_var_name.GetCString()); return err; } @@ -412,7 +412,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, if (names.GetArgumentCount() != 1) { - err.SetErrorStringWithFormat ("Invalid variable name format '%s'; cannot assign value.\n", + err.SetErrorStringWithFormat ("invalid variable name format '%s', cannot assign value", full_dot_name); return err; } @@ -424,7 +424,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, if (entry == NULL) { - err.SetErrorStringWithFormat ("Unknown instance variable '%s'; cannot assign value.\n", + err.SetErrorStringWithFormat ("unknown instance variable '%s', cannot assign value", const_var_name.GetCString()); return err; } @@ -513,7 +513,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, } if (!found) { - err.SetErrorStringWithFormat ("Unable to find variable '%s'; cannot assign value.\n", + err.SetErrorStringWithFormat ("unable to find variable '%s', cannot assign value", full_dot_name); return err; } @@ -522,7 +522,7 @@ UserSettingsController::SetVariable (const char *full_dot_name, } else { - err.SetErrorStringWithFormat ("'%s' is not a valid level name; was expecting '%s'. Cannot assign value.\n", + err.SetErrorStringWithFormat ("'%s' is not a valid level name; was expecting '%s', cannot assign value", prefix.GetCString(), m_settings.level_name.GetCString()); } @@ -553,7 +553,7 @@ UserSettingsController::GetVariable if ((prefix != m_settings.level_name) && (m_settings.level_name.GetLength () > 0)) { - err.SetErrorString ("Invalid variable name"); + err.SetErrorString ("invalid variable name"); return value; } @@ -638,7 +638,7 @@ UserSettingsController::GetVariable } } else - err.SetErrorString ("Invalid variable name"); + err.SetErrorString ("invalid variable name"); } } else @@ -647,7 +647,7 @@ UserSettingsController::GetVariable if ((global_entry == NULL) && (instance_entry == NULL)) { - err.SetErrorString ("Invalid variable name"); + err.SetErrorString ("invalid variable name"); } else if (global_entry) { @@ -1139,7 +1139,7 @@ UserSettingsController::FindSettingsDescriptions (CommandInterpreter &interprete { std::string parent_prefix; usc_sp->BuildParentPrefix (parent_prefix); - err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), + err.SetErrorStringWithFormat ("cannot find match for '%s.%s'", parent_prefix.c_str(), prefix.GetCString()); return; } @@ -1227,7 +1227,7 @@ UserSettingsController::FindSettingsDescriptions (CommandInterpreter &interprete { std::string parent_prefix; usc_sp->BuildParentPrefix (parent_prefix); - err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), search_name); + err.SetErrorStringWithFormat ("cannot find match for '%s.%s'", parent_prefix.c_str(), search_name); return; } } @@ -1266,7 +1266,7 @@ UserSettingsController::FindSettingsDescriptions (CommandInterpreter &interprete { std::string parent_prefix; usc_sp->BuildParentPrefix (parent_prefix); - err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), search_name); + err.SetErrorStringWithFormat ("cannot find match for '%s.%s'", parent_prefix.c_str(), search_name); return; } } @@ -1976,7 +1976,7 @@ UserSettingsController::VerifyOperationForType (SettableVariableType var_type, if (op == eVarSetOperationInvalid) { - err.SetErrorString ("Invalid 'settings ' subcommand operation.\n"); + err.SetErrorString ("invalid 'settings' subcommand operation"); return; } @@ -1985,22 +1985,20 @@ UserSettingsController::VerifyOperationForType (SettableVariableType var_type, case eVarSetOperationInsertBefore: case eVarSetOperationInsertAfter: if (var_type != eSetVarTypeArray) - err.SetErrorString ("Invalid operation: This operation can only be performed on array variables.\n"); + err.SetErrorString ("invalid operation: this operation can only be performed on array variables"); break; case eVarSetOperationReplace: case eVarSetOperationRemove: if ((var_type != eSetVarTypeArray) && (var_type != eSetVarTypeDictionary)) - err.SetErrorString ("Invalid operation: This operation can only be performed on array or dictionary" - " variables.\n"); + err.SetErrorString ("invalid operation: this operation can only be performed on array or dictionary variables"); break; case eVarSetOperationAppend: case eVarSetOperationClear: if ((var_type != eSetVarTypeArray) && (var_type != eSetVarTypeDictionary) && (var_type != eSetVarTypeString)) - err.SetErrorString ("Invalid operation: This operation can only be performed on array, dictionary " - "or string variables.\n"); + err.SetErrorString ("invalid operation: this operation can only be performed on array, dictionary or string variables"); break; default: break; @@ -2030,7 +2028,7 @@ UserSettingsController::UpdateStringVariable (VarSetOperationType op, else if (op == eVarSetOperationClear) string_var.clear(); else - err.SetErrorString ("Unrecognized operation. Cannot update value.\n"); + err.SetErrorString ("unrecognized operation. Cannot update value"); } Error @@ -2053,7 +2051,7 @@ UserSettingsController::UpdateStringOptionValue (const char *value, } else { - error.SetErrorString ("Unrecognized operation. Cannot update value.\n"); + error.SetErrorString ("unrecognized operation, cannot update value"); } return error; } @@ -2118,7 +2116,7 @@ UserSettingsController::UpdateBooleanVariable (VarSetOperationType op, case eVarSetOperationAppend: case eVarSetOperationInvalid: default: - err.SetErrorString ("Invalid operation for Boolean variable. Cannot update value.\n"); + err.SetErrorString ("invalid operation for Boolean variable, cannot update value"); break; case eVarSetOperationClear: @@ -2132,9 +2130,9 @@ UserSettingsController::UpdateBooleanVariable (VarSetOperationType op, if (value_cstr == NULL) - err.SetErrorStringWithFormat ("invalid boolean string value (NULL)\n"); + err.SetErrorStringWithFormat ("invalid boolean string value (NULL)"); else if (value_cstr[0] == '\0') - err.SetErrorStringWithFormat ("invalid boolean string value (empty)\n"); + err.SetErrorStringWithFormat ("invalid boolean string value (empty)"); else { bool new_value = Args::StringToBoolean (value_cstr, false, &success); @@ -2144,7 +2142,7 @@ UserSettingsController::UpdateBooleanVariable (VarSetOperationType op, bool_value = new_value; } else - err.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr); + err.SetErrorStringWithFormat ("invalid boolean string value: '%s'", value_cstr); } } break; @@ -2214,7 +2212,7 @@ UserSettingsController::UpdateStringArrayVariable (VarSetOperationType op, if (!isdigit (index_value[i])) { valid_index = false; - err.SetErrorStringWithFormat ("'%s' is not a valid integer index. Cannot update array value.\n", + err.SetErrorStringWithFormat ("'%s' is not a valid integer index, cannot update array value", index_value); } @@ -2225,8 +2223,8 @@ UserSettingsController::UpdateStringArrayVariable (VarSetOperationType op, || index >= array_var.GetArgumentCount()) { valid_index = false; - err.SetErrorStringWithFormat ("%d is outside the bounds of the specified array variable. " - "Cannot update array value.\n", index); + err.SetErrorStringWithFormat ("%d is outside the bounds of the specified array variable, " + "cannot update array value", index); } } @@ -2270,7 +2268,7 @@ UserSettingsController::UpdateStringArrayVariable (VarSetOperationType op, array_var.Clear(); break; default: - err.SetErrorString ("Unrecognized operation. Cannot update value.\n"); + err.SetErrorString ("unrecognized operation, cannot update value"); break; } } @@ -2294,10 +2292,10 @@ UserSettingsController::UpdateDictionaryVariable (VarSetOperationType op, if (pos != dictionary.end()) dictionary[key] = new_value; else - err.SetErrorStringWithFormat ("'%s' is not an existing key; cannot replace value.\n", index_value); + err.SetErrorStringWithFormat ("'%s' is not an existing key; cannot replace value", index_value); } else - err.SetErrorString ("'settings replace' requires a key for dictionary variables. No key supplied.\n"); + err.SetErrorString ("'settings replace' requires a key for dictionary variables, no key supplied"); break; case eVarSetOperationRemove: if (index_value != NULL) @@ -2306,7 +2304,7 @@ UserSettingsController::UpdateDictionaryVariable (VarSetOperationType op, dictionary.erase (key); } else - err.SetErrorString ("'settings remove' requires a key for dictionary variables. No key supplied.\n"); + err.SetErrorString ("'settings remove' requires a key for dictionary variables, no key supplied"); break; case eVarSetOperationClear: dictionary.clear (); @@ -2346,17 +2344,17 @@ UserSettingsController::UpdateDictionaryVariable (VarSetOperationType op, } else { - err.SetErrorString ("Invalid format for dictionary value. Expected one of '[\"<key>\"]=<value>', '[<key>]=<value>', or '<key>=<value>'\n"); + err.SetErrorString ("invalid format for dictionary value, expected one of '[\"<key>\"]=<value>', '[<key>]=<value>', or '<key>=<value>'"); } } } break; case eVarSetOperationInsertBefore: case eVarSetOperationInsertAfter: - err.SetErrorString ("Specified operation cannot be performed on dictionary variables.\n"); + err.SetErrorString ("specified operation cannot be performed on dictionary variables"); break; default: - err.SetErrorString ("Unrecognized operation.\n"); + err.SetErrorString ("unrecognized operation"); break; } } diff --git a/lldb/source/Core/ValueObjectChild.cpp b/lldb/source/Core/ValueObjectChild.cpp index b07b38c7544..92532a3e52c 100644 --- a/lldb/source/Core/ValueObjectChild.cpp +++ b/lldb/source/Core/ValueObjectChild.cpp @@ -179,7 +179,7 @@ ValueObjectChild::UpdateValue () // extract the child value from within the parent data? // Probably... default: - m_error.SetErrorString ("Parent has invalid value."); + m_error.SetErrorString ("parent has invalid value."); break; } } @@ -192,7 +192,7 @@ ValueObjectChild::UpdateValue () } else { - m_error.SetErrorStringWithFormat("Parent failed to evaluate: %s.\n", parent->GetError().AsCString()); + m_error.SetErrorStringWithFormat("parent failed to evaluate: %s", parent->GetError().AsCString()); } } else |
